[geeklog-cvs] Geeklog-1.x/plugins/staticpages functions.inc, 1.99, 1.100

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/staticpages
In directory qs1489.pair.com:/tmp/cvs-serv45672

Modified Files:
	functions.inc 
Log Message:
replacing image html with COM_createImage

Index: functions.inc
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/functions.inc,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** functions.inc	9 Aug 2007 19:32:20 -0000	1.99
--- functions.inc	9 Oct 2007 08:56:29 -0000	1.100
***************
*** 284,290 ****
          $icons = '';
          if ($_CONF['hideprintericon'] == 0) {
!             $printicon = '<img src="' . $_CONF['layout_url'] . '/images/print.'
!                 . $_IMAGE_TYPE . '" alt="' . $LANG01[65] . '" title="'
!                 . $LANG_STATIC['printable_format'] . '">';
              $print_url = COM_buildURL ($_CONF['site_url']
                  . '/staticpages/index.php?page=' . $page . '&disp_mode=print');
--- 284,290 ----
          $icons = '';
          if ($_CONF['hideprintericon'] == 0) {
!             $icon_url = $_CONF['layout_url'] . '/images/print.' . $_IMAGE_TYPE;
!             $attr = array('title' => $LANG_STATIC['printable_format']);
!             $printicon = COM_createImage($icon_url, $LANG01[65], $attr);
              $print_url = COM_buildURL ($_CONF['site_url']
                  . '/staticpages/index.php?page=' . $page . '&disp_mode=print');
***************
*** 295,304 ****
                  $A['perm_group'], $A['perm_members'], $A['perm_anon']) == 3) &&
                  SEC_hasRights ('staticpages.edit')) {
              $url = $_CONF['site_admin_url']
                  . '/plugins/staticpages/index.php?mode=edit&sp_id=' . $page;
-             $attr = array('class' => 'editlink','title' => $LANG_STATIC['edit']);
-             $editicon = $_CONF['layout_url'] . '/images/edit.' . $_IMAGE_TYPE;
-             $editiconhtml = '<img src="' . $editicon . '" alt="' . $LANG_STATIC['edit']
-                 . '" title="' . $LANG_STATIC['edit'] . '">';
              $icon =
                  ' ' . COM_createLink(
--- 295,304 ----
                  $A['perm_group'], $A['perm_members'], $A['perm_anon']) == 3) &&
                  SEC_hasRights ('staticpages.edit')) {
+             $icon_url = $_CONF['layout_url'] . '/images/edit.' . $_IMAGE_TYPE;
+             $attr = array('title' => $LANG_STATIC['edit']);
+             $editiconhtml = COM_createImage($icon_url, $LANG_STATIC['edit'], $attr);
+             $attr = array('class' => 'editlink','title' => $LANG_STATIC['edit']);
              $url = $_CONF['site_admin_url']
                  . '/plugins/staticpages/index.php?mode=edit&sp_id=' . $page;
              $icon =
                  ' ' . COM_createLink(
***************
*** 448,452 ****
          if ($mode == 'print') {
              $retval = SP_printPage($page, $retval);
!         } elseif ($mode =='autotag') {
              $retval = SP_render_content(stripslashes($retval['sp_content']), $retval['sp_php']);
          } else {
--- 448,452 ----
          if ($mode == 'print') {
              $retval = SP_printPage($page, $retval);
!         } else if ($mode =='autotag') {
              $retval = SP_render_content(stripslashes($retval['sp_content']), $retval['sp_php']);
          } else {
***************
*** 858,864 ****
              $icons = '';
              if ($_CONF['hideprintericon'] == 0) {
!                 $printicon = '<img src="' . $_CONF['layout_url'] . '/images/print.'
!                     . $_IMAGE_TYPE . '" alt="' . $LANG01[65] . '" title="'
!                     . $LANG_STATIC['printable_format'] . '">';
                  $print_url = COM_buildURL ($_CONF['site_url']
                      . '/staticpages/index.php?page=' . $S['sp_id'] . '&mode=print');
--- 858,864 ----
              $icons = '';
              if ($_CONF['hideprintericon'] == 0) {
!                 $icon_url = $_CONF['layout_url'] . '/images/print.' . $_IMAGE_TYPE;
!                 $attr = array('title' => $LANG_STATIC['printable_format']);
!                 $printicon = COM_createImage($icon_url, $LANG01[65], $attr);
                  $print_url = COM_buildURL ($_CONF['site_url']
                      . '/staticpages/index.php?page=' . $S['sp_id'] . '&mode=print');
***************
*** 869,878 ****
                      $S['perm_group'], $S['perm_members'], $S['perm_anon']) == 3) &&
                      SEC_hasRights ('staticpages.edit')) {
                  $url = $_CONF['site_admin_url']
                      . '/plugins/staticpages/index.php?mode=edit&sp_id=' . $S['sp_id'];
                  $attr = array('class' => 'editlink','title' => $LANG_STATIC['edit']);
-                 $editicon = $_CONF['layout_url'] . '/images/edit.' . $_IMAGE_TYPE;
-                 $editiconhtml = '<img src="' . $editicon . '" alt="' . $LANG_STATIC['edit']
-                     . '" title="' . $LANG_STATIC['edit'] . '">';
                  $icon =
                      ' ' . COM_createLink(
--- 869,878 ----
                      $S['perm_group'], $S['perm_members'], $S['perm_anon']) == 3) &&
                      SEC_hasRights ('staticpages.edit')) {
+                 $icon_url = $_CONF['layout_url'] . '/images/edit.' . $_IMAGE_TYPE;
+                 $attr = array('title' => $LANG_STATIC['edit']);
+                 $editiconhtml = COM_createImage($icon_url, $LANG_STATIC['edit'], $attr);
                  $url = $_CONF['site_admin_url']
                      . '/plugins/staticpages/index.php?mode=edit&sp_id=' . $S['sp_id'];
                  $attr = array('class' => 'editlink','title' => $LANG_STATIC['edit']);
                  $icon =
                      ' ' . COM_createLink(