[geeklog-cvs] Geeklog-1.x/plugins/staticpages services.inc.php, 1.11, 1.12

[Dirk Haun]

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

Modified Files:
	services.inc.php 
Log Message:
More E_ALL fixes


Index: services.inc.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/staticpages/services.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** services.inc.php	28 Jun 2008 18:44:09 -0000	1.11
--- services.inc.php	28 Jun 2008 21:20:34 -0000	1.12
***************
*** 132,148 ****
      // Apply filters to the parameters passed by the webservice 
      if ($args['gl_svc']) {
!         $args['mode'] = COM_applyBasicFilter($args['mode']);
!         $args['sp_id'] = COM_applyBasicFilter($args['sp_id']);
!         $args['sp_old_id'] = COM_applyBasicFilter($args['sp_old_id']);
!         $args['sp_uid'] = COM_applyBasicFilter($args['sp_uid'], true);
!         $args['sp_tid'] = COM_applyBasicFilter($args['sp_tid']);
!         $args['sp_hits'] = COM_applyBasicFilter($args['sp_hits'], true);
!         $args['sp_format'] = COM_applyBasicFilter($args['sp_format']);
!         $args['owner_id'] = COM_applyBasicFilter($args['owner_id'], true);
!         $args['group_id'] = COM_applyBasicFilter($args['group_id'], true);
!         $args['sp_where'] = COM_applyBasicFilter($args['sp_where'], true);
!         $args['sp_php'] = COM_applyBasicFilter($args['sp_php'], true);
!         $args['postmode'] = COM_applyBasicFilter($args['postmode']);
!         $args['commentcode'] = COM_applyBasicFilter($args['commentcode'], true);
      }
  
--- 132,155 ----
      // Apply filters to the parameters passed by the webservice 
      if ($args['gl_svc']) {
!         $par_str = array('mode', 'sp_id', 'sp_old_id', 'sp_tid', 'sp_format',
!                          'postmode');
!         $par_num = array('sp_uid', 'sp_hits', 'owner_id', 'group_id',
!                          'sp_where', 'sp_php', 'commentcode');
! 
!         foreach ($par_str as $str) {
!             if (isset($args[$str])) {
!                 $args[$str] = COM_applyBasicFilter($args[$str]);
!             } else {
!                 $args[$str] = '';
!             }
!         }
! 
!         foreach ($par_num as $num) {
!             if (isset($args[$num])) {
!                 $args[$num] = COM_applyBasicFilter($args[$num], true);
!             } else {
!                 $args[$num] = 0;
!             }
!         }
      }
  
***************
*** 192,196 ****
          }
  
!         if (($args['sp_onmenu'] == 'on') && empty($args['sp_label'])) {
              $svc_msg['error_desc'] = 'Menu label missing';
              return PLG_RET_ERROR;
--- 199,205 ----
          }
  
!         if (!isset($args['sp_onmenu'])) {
!             $args['sp_onmenu'] = '';
!         } else if (($args['sp_onmenu'] == 'on') && empty($args['sp_label'])) {
              $svc_msg['error_desc'] = 'Menu label missing';
              return PLG_RET_ERROR;
***************
*** 211,215 ****
      }
  
- 
      // END: Staticpages defaults 
  
--- 220,223 ----
***************
*** 221,225 ****
      $sp_format = $args['sp_format'];
      $sp_onmenu = $args['sp_onmenu'];
!     $sp_label = $args['sp_label'];
      $commentcode = $args['commentcode'];
      $owner_id = $args['owner_id'];
--- 229,236 ----
      $sp_format = $args['sp_format'];
      $sp_onmenu = $args['sp_onmenu'];
!     $sp_label = '';
!     if (!empty($args['sp_label'])) {
!         $sp_label = $args['sp_label'];
!     }
      $commentcode = $args['commentcode'];
      $owner_id = $args['owner_id'];
***************
*** 230,237 ****
      $perm_anon = $args['perm_anon'];
      $sp_php = $args['sp_php'];
!     $sp_nf = $args['sp_nf'];
      $sp_old_id = $args['sp_old_id'];
      $sp_centerblock = $args['sp_centerblock'];
!     $sp_help = $args['sp_help'];
      $sp_tid = $args['sp_tid'];
      $sp_where = $args['sp_where'];
--- 241,254 ----
      $perm_anon = $args['perm_anon'];
      $sp_php = $args['sp_php'];
!     $sp_nf = '';
!     if (!empty($args['sp_nf'])) {
!         $sp_nf = $args['sp_nf'];
!     }
      $sp_old_id = $args['sp_old_id'];
      $sp_centerblock = $args['sp_centerblock'];
!     $sp_help = '';
!     if (!empty($args['sp_help'])) {
!         $sp_help = $args['sp_help'];
!     }
      $sp_tid = $args['sp_tid'];
      $sp_where = $args['sp_where'];