[geeklog-cvs] geeklog: Changed the function names of COM_Tooltip and COM_NoScr...

[geeklog-cvs at lists.geeklog.net]

changeset 8225:0b2e3abe1524
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/0b2e3abe1524
user: Tom <websitemaster at cogeco.net>
date: Tue Apr 12 10:30:51 2011 -0400
description:
Changed the function names of COM_Tooltip and COM_NoScript to COM_getTooltip and COM_getNoScript

diffstat:

 public_html/admin/plugins/staticpages/index.php |  2 +-
 public_html/lib-common.php                      |  6 +++---
 public_html/usersettings.php                    |  2 +-
 system/classes/config.class.php                 |  6 +++---
 system/lib-comment.php                          |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diffs (90 lines):

diff -r 6fd7be1e9be0 -r 0b2e3abe1524 public_html/admin/plugins/staticpages/index.php
--- a/public_html/admin/plugins/staticpages/index.php	Tue Apr 12 09:35:54 2011 -0400
+++ b/public_html/admin/plugins/staticpages/index.php	Tue Apr 12 10:30:51 2011 -0400
@@ -101,7 +101,7 @@
         } else {
             $link_message = $LANG01[138];    
         } 
-        $sp_template->set_var('noscript', COM_NoScript(false, '', $link_message));        
+        $sp_template->set_var('noscript', COM_getNoScript(false, '', $link_message));        
         
         // Add JavaScript
         $js = 'geeklogEditorBasePath = "' . $_CONF['site_url'] . '/fckeditor/";';
diff -r 6fd7be1e9be0 -r 0b2e3abe1524 public_html/lib-common.php
--- a/public_html/lib-common.php	Tue Apr 12 09:35:54 2011 -0400
+++ b/public_html/lib-common.php	Tue Apr 12 10:30:51 2011 -0400
@@ -3977,7 +3977,7 @@
             $comma = ', ';
         }
         if (! empty($description[$tag])) {
-           $retval .= $comma . COM_Tooltip('[' . $tag . ':]', $description[$tag], '', $LANG01[132],'information');
+           $retval .= $comma . COM_getTooltip('[' . $tag . ':]', $description[$tag], '', $LANG01[132],'information');
         } else {
             $retval .= $comma . '[' . $tag . ':]';
         }
@@ -6748,7 +6748,7 @@
 * @return   string                      noscript html tag with message(s)
 *
 */
-function COM_NoScript($warning = true, $noscript_message = '', $link_message = '')
+function COM_getNoScript($warning = true, $noscript_message = '', $link_message = '')
 {
     global $_CONF, $LANG01;
     
@@ -6792,7 +6792,7 @@
 * @return   string              HTML tooltip
 *
 */
-function COM_Tooltip($hoverover = '', $text = '', $link = '', $title = '', $template = 'classic', $class = 'gl-tooltip') 
+function COM_getTooltip($hoverover = '', $text = '', $link = '', $title = '', $template = 'classic', $class = 'gl-tooltip') 
 {
     global $_CONF, $_IMAGE_TYPE, $_SCRIPTS;
     
diff -r 6fd7be1e9be0 -r 0b2e3abe1524 public_html/usersettings.php
--- a/public_html/usersettings.php	Tue Apr 12 09:35:54 2011 -0400
+++ b/public_html/usersettings.php	Tue Apr 12 10:30:51 2011 -0400
@@ -75,7 +75,7 @@
     $preferences->set_var ('navbar', $navbar->generate());
 
     //$preferences->set_var ('no_javascript_warning', $LANG04[150]);
-    $preferences->set_var('noscript', COM_NoScript());
+    $preferences->set_var('noscript', COM_getNoScript());
 
     $preferences->set_var ('cssid1', 1);
     $preferences->set_var ('cssid2', 2);
diff -r 6fd7be1e9be0 -r 0b2e3abe1524 system/classes/config.class.php
--- a/system/classes/config.class.php	Tue Apr 12 09:35:54 2011 -0400
+++ b/system/classes/config.class.php	Tue Apr 12 10:30:51 2011 -0400
@@ -779,9 +779,9 @@
                            'menugroup' => 'menu_element.thtml'));
 
         $link_message = $LANG01[139];   
-        $t->set_var('noscript', COM_NoScript(false, '', $link_message));
+        $t->set_var('noscript', COM_getNoScript(false, '', $link_message));
         // Hide the Configuration as Javascript is currently required. If JS is enabled then the JS below will un-hide it
-        $js .= 'document.getElementById("advanced_editor").style.display="";';                 
+        $js = 'document.getElementById("advanced_editor").style.display="";';                 
         $_SCRIPTS->setJavaScript($js, true);        
         
         $t->set_var('gltoken_name', CSRF_TOKEN);
@@ -1811,7 +1811,7 @@
             }              
         } else {
             $t->set_var('doc_url', '');
-            $retval = "(" . COM_Tooltip("?", $configtext, '', $option,'information') . ")";
+            $retval = "(" . COM_getTooltip("?", $configtext, '', $option,'information') . ")";
             $t->set_var('doc_link', $retval);            
         }
 
diff -r 6fd7be1e9be0 -r 0b2e3abe1524 system/lib-comment.php
--- a/system/lib-comment.php	Tue Apr 12 09:35:54 2011 -0400
+++ b/system/lib-comment.php	Tue Apr 12 10:30:51 2011 -0400
@@ -873,7 +873,7 @@
                 } else {
                     $link_message = $LANG01[138];    
                 } 
-                $comment_template->set_var('noscript', COM_NoScript(false, '', $link_message));
+                $comment_template->set_var('noscript', COM_getNoScript(false, '', $link_message));
                 
                 // Add JavaScript
                 $js = 'geeklogEditorBasePath = "' . $_CONF['site_url'] . '/fckeditor/";';