Changeset 21608 for extensions/Subscribe_to_comments

Timestamp:

Mar 16, 2013, 8:32:05 PM (11 years ago)

Author:

mistic100

Message:

code clean, add admin list of all subscribers

Location:

extensions/Subscribe_to_comments

Files:

• admin (added)
• admin.php (modified) (1 diff)
• admin/config.php (copied) (copied from extensions/Subscribe_to_comments/admin.php) (2 diffs)
• admin/index.php (copied) (copied from extensions/Subscribe_to_comments/index.php)
• admin/subscriptions.php (added)
• admin/template (added)
• admin/template/config.tpl (moved) (moved from extensions/Subscribe_to_comments/template/admin.tpl)
• admin/template/index.php (copied) (copied from extensions/Subscribe_to_comments/index.php)
• admin/template/style.css (added)
• admin/template/subscriptions.tpl (added)
• include/functions.inc.php (modified) (7 diffs)
• include/subscribe_to_comments.inc.php (modified) (1 diff)
• include/subscribtions_page.inc.php (modified) (2 diffs)
• language/en_UK/plugin.lang.php (modified) (1 diff)
• language/fr_FR/plugin.lang.php (modified) (2 diffs)
• main.inc.php (modified) (3 diffs)

extensions/Subscribe_to_comments/admin.php

@@ -1 +1 @@
 <?php
-if(!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+if (!defined('SUBSCRIBE_TO_PATH')) die('Hacking attempt!');
 
-// +-----------------------------------------------------------------------+
-//                         Save configuration                              |
-// +-----------------------------------------------------------------------+
-if (isset($_POST['config_submit'])) 
-{
-  $conf['Subscribe_to_Comments'] = array(
-    'notify_admin_on_subscribe' => isset($_POST['notify_admin_on_subscribe']),
-    'allow_global_subscriptions' => isset($_POST['allow_global_subscriptions']),
-    );
-  
-  conf_update_param('Subscribe_to_Comments', serialize($conf['Subscribe_to_Comments']));
-  array_push($page['infos'], l10n('Information data registered in database'));
-}  
+global $template, $page, $conf;
 
 
-// +-----------------------------------------------------------------------+
-//                               Template                                  |
-// +-----------------------------------------------------------------------+  
+// tabsheet
+include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
+$page['tab'] = (isset($_GET['tab'])) ? $_GET['tab'] : 'subscriptions';
+  
+$tabsheet = new tabsheet();
+$tabsheet->add('subscriptions', l10n('Manage'), SUBSCRIBE_TO_ADMIN . '-subscriptions');
+$tabsheet->add('config', l10n('Configuration'), SUBSCRIBE_TO_ADMIN . '-config');
+$tabsheet->select($page['tab']);
+$tabsheet->assign();
+
+
+// include page
+include(SUBSCRIBE_TO_PATH . 'admin/' . $page['tab'] . '.php');
+
+// template
 $template->assign(array(
   'SUBSCRIBE_TO_PATH' => SUBSCRIBE_TO_PATH,
-  'notify_admin_on_subscribe' => $conf['Subscribe_to_Comments']['notify_admin_on_subscribe'],
-  'allow_global_subscriptions' => $conf['Subscribe_to_Comments']['allow_global_subscriptions'],
+  'SUBSCRIBE_TO_ADMIN' => SUBSCRIBE_TO_ADMIN,
   ));
-
-$template->set_filename('plugin_admin_content', dirname(__FILE__).'/template/admin.tpl');
-$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
+  
+$template->assign_var_from_handle('ADMIN_CONTENT', 'stc_admin');
 
 ?>

extensions/Subscribe_to_comments/admin/config.php

@@ -1 +1 @@
 <?php
-if(!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+if (!defined('SUBSCRIBE_TO_PATH')) die('Hacking attempt!');
 
 // +-----------------------------------------------------------------------+
@@ -20 +20 @@
 //                               Template                                  |
 // +-----------------------------------------------------------------------+  
-$template->assign(array(
-  'SUBSCRIBE_TO_PATH' => SUBSCRIBE_TO_PATH,
-  'notify_admin_on_subscribe' => $conf['Subscribe_to_Comments']['notify_admin_on_subscribe'],
-  'allow_global_subscriptions' => $conf['Subscribe_to_Comments']['allow_global_subscriptions'],
-  ));
+$template->assign($conf['Subscribe_to_Comments']);
 
-$template->set_filename('plugin_admin_content', dirname(__FILE__).'/template/admin.tpl');
-$template->assign_var_from_handle('ADMIN_CONTENT', 'plugin_admin_content');
+$template->set_filename('stc_admin', realpath(SUBSCRIBE_TO_PATH . 'admin/template/config.tpl'));
 
 ?>

extensions/Subscribe_to_comments/include/functions.inc.php

@@ -1 +1 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+if (!defined('SUBSCRIBE_TO_PATH')) die('Hacking attempt!');
 
 include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
@@ -90 +90 @@
   $subject = '['.strip_tags($conf['gallery_title']).'] Re:'.$element['name'];
     
-  $template->set_filename('stc_mail', dirname(__FILE__).'/../template/mail/notification.tpl');
+  $template->set_filename('stc_mail', realpath(SUBSCRIBE_TO_PATH . 'template/mail/notification.tpl'));
 
   foreach ($subscriptions as $row)
@@ -225 +225 @@
     set_make_full_url();
     
-    $template->set_filename('stc_mail', dirname(__FILE__).'/../template/mail/confirm.tpl');
+    $template->set_filename('stc_mail', realpath(SUBSCRIBE_TO_PATH . 'template/mail/confirm.tpl'));
     
     $subject = '['.strip_tags($conf['gallery_title']).'] '.l10n('Confirm your subscribtion to comments');
@@ -375 +375 @@
   load_language('plugin.lang', SUBSCRIBE_TO_PATH);
   
-  $template->set_filename('stc_mail', dirname(__FILE__).'/../template/mail/admin.tpl');
+  $template->set_filename('stc_mail', realpath(SUBSCRIBE_TO_PATH . 'template/mail/admin.tpl'));
     
   $subject = '['.strip_tags($conf['gallery_title']).'] '.sprintf(l10n('%s has subscribed to comments on %s.'), is_a_guest()?$email:$user['username'], null);
@@ -515 +515 @@
   // template
   $template->set_filenames(array(
-    'stc_mail_header' => dirname(__FILE__).'/../template/mail/header.tpl',
-    'stc_mail_footer' => dirname(__FILE__).'/../template/mail/footer.tpl',
+    'stc_mail_header' => realpath(SUBSCRIBE_TO_PATH . 'template/mail/header.tpl'),
+    'stc_mail_footer' => realpath(SUBSCRIBE_TO_PATH . 'template/mail/footer.tpl'),
     ));
-  $stc_mail_css = file_get_contents(dirname(__FILE__).'/../template/mail/style.css');
+  $stc_mail_css = file_get_contents(realpath(SUBSCRIBE_TO_PATH . 'template/mail/style.css'));
     
   $template->assign(array(
@@ -570 +570 @@
     $element['name'] = get_name_from_file($element['file']);
   }
-  
-  $url_params = array('image_id' => $element['id']);
-  $element['url'] = make_picture_url($url_params);
+  $element['name'] = trigger_event('render_element_name', $element['name']);
+  
+  $element['url'] = make_picture_url(array(
+    'image_id'=>$element['id']
+    ));
   
   if ($with_thumb)
@@ -616 +618 @@
     'category'=>$element,
     ));
+    
+  $element['name'] = trigger_event('render_category_name', $element['name']);
   
   if ($with_thumb)

extensions/Subscribe_to_comments/include/subscribe_to_comments.inc.php

@@ -1 +1 @@
 <?php
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+if (!defined('SUBSCRIBE_TO_PATH')) die('Hacking attempt!');
 
 /**

extensions/Subscribe_to_comments/include/subscribtions_page.inc.php

@@ -1 +1 @@
 <?php 
-if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
+if (!defined('SUBSCRIBE_TO_PATH')) die('Hacking attempt!');
 
 global $template, $conf, $page, $user;
@@ -251 +251 @@
 }
 
-$template->set_filenames(array('index'=> dirname(__FILE__).'/../template/subscribtions_page.tpl'));
+$template->set_filename('index', realpath(SUBSCRIBE_TO_PATH . 'template/subscribtions_page.tpl'));
 
 ?>

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

@@ -46 +46 @@
 $lang['comments on all pictures of an album'] = 'comments on all pictures of an album';
 $lang['comments on an album'] = 'comments on an album';
+$lang['First subscription'] = 'First subscription';
+$lang['Last subscription'] = 'Last subscription';
+$lang['All album photos'] = 'All album photos';
+$lang['★ : registered users'] = '★ : registered users';
+$lang['No result'] = 'No result';
 
 ?>

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

@@ -13 +13 @@
 $lang['Return to item page'] = 'Retourner à la page de l\'élément';
 $lang['New comment on'] = 'Nouveau commentaire sur';
-
 $lang['%s has subscribed to comments on'] = '%s s\'est inscrit aux commentaires de';
 $lang['Allow users to subscribe to global notifications'] = 'Autoriser les utilisateurs à s\'inscrire de façon globale';
@@ -54 +53 @@
 $lang['You are currently subscribed to comments on %s.'] = 'Vous êtes inscrits aux commentaires sur %s.';
 $lang['You requested to subscribe by email to comments on %s'] = 'Vous avez demandez à vous inscrire aux commentaires sur %s.';
+$lang['First subscription'] = 'Premier abonnement';
+$lang['Last subscription'] = 'Dernier abonnement';
+$lang['All album photos'] = 'Toutes les images d\'un album';
+$lang['★ : registered users'] = '★ : utilisateurs enregistrées';
+
 ?>

extensions/Subscribe_to_comments/main.inc.php

@@ -9 +9 @@
 */
 
-/*
- * potential problem : if the permissions of a user change, he receives notifications
- * about photos and albums he can't see anymore
- */
-
 if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
@@ -21 +16 @@
 define('SUBSCRIBE_TO_PATH' ,   PHPWG_PLUGINS_PATH . SUBSCRIBE_TO_ID . '/');
 define('SUBSCRIBE_TO_TABLE',   $prefixeTable . 'subscribe_to_comments');
+define('SUBSCRIBE_TO_ADMIN',   get_root_url() . 'admin.php?page=plugin-' . SUBSCRIBE_TO_ID);
 define('SUBSCRIBE_TO_VERSION', 'auto');
 
@@ -98 +94 @@
   array_push($menu, array(
     'NAME' => 'Subscribe to Comments',
-    'URL' => get_root_url().'admin.php?page=plugin-' . SUBSCRIBE_TO_ID,
+    'URL' => SUBSCRIBE_TO_ADMIN,
   ));
   return $menu;