? reptag-coder_help_and_notices.20090108.patch
? reptag-help_and_notices.20090108.patch
Index: reptag.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reptag/reptag.install,v
retrieving revision 1.17.2.2
diff -u -p -r1.17.2.2 reptag.install
--- reptag.install 28 Sep 2008 11:19:35 -0000 1.17.2.2
+++ reptag.install 8 Jan 2009 03:15:08 -0000
@@ -1,6 +1,11 @@
db_query("INSERT INTO {reptag_vars} (name, value, uid, language) VALUES ('%s', '%s', %d, '%s')",
+ 'success' => update_sql("INSERT INTO {reptag_vars} (name, value, uid, language) VALUES ('%s', '%s', %d, '%s')",
$var->name, unserialize($var->value), $var->uid, empty($var->language) ? 'en' : $var->language),
'query' => 'Migrating existing table tags (SELECT -> INSERT): \''. check_plain($var->name) .'\''
);
Index: reptag.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reptag/reptag.module,v
retrieving revision 1.39.2.5
diff -u -p -r1.39.2.5 reptag.module
--- reptag.module 29 Nov 2008 17:13:12 -0000 1.39.2.5
+++ reptag.module 8 Jan 2009 03:15:10 -0000
@@ -1,6 +1,14 @@
'reptag_admin_table.inc',
'arguments' => array('content' => NULL, 'title' => t('Rep[lacement]Tags Dialog')),
),
+ // Even tags need to declare their themes
+ 'reptag_node_embed' => array(
+ 'file' => 'tags/node.tags.inc',
+ 'arguments' => array('node' => NULL),
+ ),
);
// Register theme functions of enabled .tags modules
@@ -352,7 +365,7 @@ function reptag_node_type($op, $info) {
function reptag_form_alter(&$form, $form_state, $form_id) {
if (variable_get('reptag_showhelp', 1)) {
// Add reptag help to node form and comment form
- if ((isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id)
+ if ((isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id)
|| ($form_id == 'comment_form' && variable_get('reptag_enable_comments', 0))) {
$help = _reptag_online_help();
if (count($help)) {
@@ -448,3 +461,33 @@ function reptag_workspace() {
return drupal_get_form('_reptag_admin_user_form');
}
+
+/**
+ * Implementation of hook_help()
+ */
+function reptag_help($path, $arg) {
+ switch ($path) {
+ case 'admin/settings/reptag' :
+ return t("
+ Reptag will replace a variety of tags, tokens and variables in text fields within nodes.
+ The node content types and the fields within these node types that are processed can be defined here.
+
Different reptag sub-modules provide different groups of available tag replacements.
+ Enable the reptag modules to use them.
+
Reptag tags are saved in the database storage in the unexpanded form,
+ and are only applied when a node is viewed.
+
Some reptag values are 'static' and can be cached,
+ others are dynamically calculated on-the-fly.
+ ");
+ break;
+ case 'admin/settings/reptag/site' :
+ case 'admin/settings/reptag/user' :
+ return t("
+ Enter token names and their replacement text.
+ New tokens can be used by surrounding them with '\$' signs in the target text.
+
Example: Tag: ADDRESS => Replacement: 21 Nonesuch st
+
Embedding \$ADDRESS\$ in node body will be replaced with \"21 Nonesuch st\" in all cases.
+ ");
+ break;
+
+ };
+}
\ No newline at end of file
Index: reptag_admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reptag/reptag_admin.inc,v
retrieving revision 1.16.2.4
diff -u -p -r1.16.2.4 reptag_admin.inc
--- reptag_admin.inc 29 Nov 2008 17:13:12 -0000 1.16.2.4
+++ reptag_admin.inc 8 Jan 2009 03:15:18 -0000
@@ -1,6 +1,11 @@
.node .content .block {
Index: tags/format.tags.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reptag/tags/format.tags.inc,v
retrieving revision 1.2
diff -u -p -r1.2 format.tags.inc
--- tags/format.tags.inc 4 Jun 2008 12:21:07 -0000 1.2
+++ tags/format.tags.inc 8 Jan 2009 03:15:22 -0000
@@ -1,6 +1,14 @@
format_date(time(), 'large'),
@@ -25,18 +33,18 @@ function _reptag_system_init($context) {
"#{SITE}#" => variable_get('site_name', 'Drupal'),
"#{PAGE}#" => request_uri(),
- "#{USERNAME}#" => _reptag_system_user($user->name),
+ // Use @ to quiet PHP notices if the user is anonymous
+ "#{USERNAME}#" => @_reptag_system_user($user->name),
"#{USERID}#" => $user->uid,
- "#{USERMAIL}#" => $user->mail,
- "#{USER_CREATED}#" => format_date($user->created, 'small'),
- "#{USER_ACCESS}#" => format_date($user->access, 'small'),
- "#{USER_LOGIN}#" => format_date($user->login, 'small'),
- "#{USER_SESSION}#" => date('H:i', (time() - $user->login)),
- "#{USERLANG}#" => _reptag_language(),
+ "#{USERMAIL}#" => @$user->mail,
+ "#{USER_CREATED}#" => @format_date($user->created, 'small'),
+ "#{USER_ACCESS}#" => @format_date($user->access, 'small'),
+ "#{USER_LOGIN}#" => @format_date($user->login, 'small'),
+ "#{USER_SESSION}#" => @date('H:i', (time() - $user->login)),
+ "#{USERLANG}#" => @_reptag_language(),
//"#{PHP\}(.*?)\{/PHP\}#se" => "''. _reptag_system_php_exec(stripslashes('\\1')) .''",
"#{PHP:(.*?)\}#e" => "''"
-
);
}
Index: tags/token.tags.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/reptag/tags/token.tags.inc,v
retrieving revision 1.1
diff -u -p -r1.1 token.tags.inc
--- tags/token.tags.inc 4 Jun 2008 12:21:07 -0000 1.1
+++ tags/token.tags.inc 8 Jan 2009 03:15:23 -0000
@@ -1,6 +1,14 @@
"_reptag_video_googlevideo('\\1', \\3, \\4, '\\2');",