[Lsb-messages] /var/www/bzr/lsb/devel/dbadmin r250: Refactor set_distro_filters to reduce use of $_REQUEST directly.

Jeff Licquia licquia at linuxfoundation.org
Wed May 16 23:46:37 UTC 2012


------------------------------------------------------------
revno: 250
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: dbadmin
timestamp: Wed 2012-05-16 19:46:37 -0400
message:
  Refactor set_distro_filters to reduce use of $_REQUEST directly.
modified:
  browse/class_single.php
  browse/cmd_single.php
  browse/component.php
  browse/distr.php
  browse/rawclass.php
  browse/rawcmd.php
  browse/rawilmodule.php
  browse/rawint.php
  browse/rawlib.php
  browse/type_single.php
  commons.inc
-------------- next part --------------
=== modified file 'browse/class_single.php'
--- a/browse/class_single.php	2011-08-29 07:50:40 +0000
+++ b/browse/class_single.php	2012-05-16 23:46:37 +0000
@@ -18,7 +18,11 @@
 $archfilter = 'None';
 $lsbversion = 'None';
 
-set_distro_filters();
+check_request_literal_params('cmd');
+check_request_literal_params('changeDname');
+check_request_literal_params('changeCompName');
+set_distro_filters($_REQUEST['cmd'], $_REQUEST['changeDname'],
+                   $_REQUEST['changeCompName']);
 
 create_tmp_Interface_table();
 create_tmp_Class_table();

=== modified file 'browse/cmd_single.php'
--- a/browse/cmd_single.php	2012-04-18 08:11:35 +0000
+++ b/browse/cmd_single.php	2012-05-16 23:46:37 +0000
@@ -18,7 +18,11 @@
 $archfilter = 'None';
 $lsbversion = 'None';
 
-set_distro_filters();
+check_request_literal_params('cmd');
+check_request_literal_params('changeDname');
+check_request_literal_params('changeCompName');
+set_distro_filters($_REQUEST['cmd'], $_REQUEST['changeDname'],
+                   $_REQUEST['changeCompName']);
 
 //create_tmp_RawCmd_table();
 create_tmp_Interface_table();

=== modified file 'browse/component.php'
--- a/browse/component.php	2011-08-29 07:50:40 +0000
+++ b/browse/component.php	2012-05-16 23:46:37 +0000
@@ -16,7 +16,11 @@
 global $tmpComponent, $distr_filter;
 create_tmp_Component_table();
 
-set_distro_filters();
+check_request_literal_params('cmd');
+check_request_literal_params('changeDname');
+check_request_literal_params('changeCompName');
+set_distro_filters($_REQUEST['cmd'], $_REQUEST['changeDname'],
+                   $_REQUEST['changeCompName']);
 
 $lsb_change_link = '../browse/component.php';
 if( $_REQUEST['cmd'] ) {
@@ -27,7 +31,9 @@
         $_REQUEST['changeDname'] = "-1";
         $_REQUEST['changeAname'] = "-1";
         $_REQUEST['changeCompName'] = "-1";
-        set_distro_filters();
+        check_request_literal_params('cmd');
+        set_distro_filters($_REQUEST['cmd'], $_REQUEST['changeDname'],
+                           $_REQUEST['changeCompName']);
     }
 
     $distr_filter = false;

=== modified file 'browse/distr.php'
--- a/browse/distr.php	2011-08-29 07:50:40 +0000
+++ b/browse/distr.php	2012-05-16 23:46:37 +0000
@@ -20,7 +20,9 @@
 $_REQUEST['changeDname'] = "-1";
 $_REQUEST['changeAname'] = "-1";
 $_REQUEST['changeCompName'] = "-1";
-set_distro_filters();
+check_request_literal_params('cmd');
+set_distro_filters($_REQUEST['cmd'], $_REQUEST['changeDname'],
+                   $_REQUEST['changeCompName']);
 
 $lsb_change_link = '../browse/distr.php';
 if( $_REQUEST['cmd'] ) {

=== modified file 'browse/rawclass.php'
--- a/browse/rawclass.php	2011-08-29 07:50:40 +0000
+++ b/browse/rawclass.php	2012-05-16 23:46:37 +0000
@@ -16,7 +16,11 @@
 
 // create_tmp_RawClass_table();
 
-set_distro_filters();
+check_request_literal_params('cmd');
+check_request_literal_params('changeDname');
+check_request_literal_params('changeCompName');
+set_distro_filters($_REQUEST['cmd'], $_REQUEST['changeDname'],
+                   $_REQUEST['changeCompName']);
 
 $lsb_change_link = '../browse/rawclass.php';
 if( $_REQUEST['cmd'] ) {

=== modified file 'browse/rawcmd.php'
--- a/browse/rawcmd.php	2011-08-29 07:50:40 +0000
+++ b/browse/rawcmd.php	2012-05-16 23:46:37 +0000
@@ -17,7 +17,11 @@
 
 create_tmp_RawCmd_table();
 
-set_distro_filters();
+check_request_literal_params('cmd');
+check_request_literal_params('changeDname');
+check_request_literal_params('changeCompName');
+set_distro_filters($_REQUEST['cmd'], $_REQUEST['changeDname'],
+                   $_REQUEST['changeCompName']);
 
 global $distr_filter;
 

=== modified file 'browse/rawilmodule.php'
--- a/browse/rawilmodule.php	2011-08-29 07:50:40 +0000
+++ b/browse/rawilmodule.php	2012-05-16 23:46:37 +0000
@@ -14,8 +14,6 @@
 include("db.inc");
 include("../commons.inc");
 
-// set_distro_filters();
-
 $lsb_change_link = '../browse/rawilmodule.php';
 if( $_REQUEST['cmd'] ) {
     $lsb_change_link.= form_lsb_change_link();

=== modified file 'browse/rawint.php'
--- a/browse/rawint.php	2011-08-29 07:50:40 +0000
+++ b/browse/rawint.php	2012-05-16 23:46:37 +0000
@@ -21,7 +21,11 @@
 create_tmp_Application_table();
 // create_tmp_RawInt_table();
 
-set_distro_filters();
+check_request_literal_params('cmd');
+check_request_literal_params('changeDname');
+check_request_literal_params('changeCompName');
+set_distro_filters($_REQUEST['cmd'], $_REQUEST['changeDname'],
+                   $_REQUEST['changeCompName']);
 
 $lsb_change_link = '../browse/rawint.php';
 if( isset($_REQUEST['cmd']) && $_REQUEST['cmd'] ) {

=== modified file 'browse/rawlib.php'
--- a/browse/rawlib.php	2011-08-29 07:50:40 +0000
+++ b/browse/rawlib.php	2012-05-16 23:46:37 +0000
@@ -19,7 +19,11 @@
 create_tmp_Component_table();
 create_tmp_Distribution_table();
 
-set_distro_filters();
+check_request_literal_params('cmd');
+check_request_literal_params('changeDname');
+check_request_literal_params('changeCompName');
+set_distro_filters($_REQUEST['cmd'], $_REQUEST['changeDname'],
+                   $_REQUEST['changeCompName']);
 
 $lsb_change_link = '../browse/rawlib.php';
 

=== modified file 'browse/type_single.php'
--- a/browse/type_single.php	2011-08-29 07:50:40 +0000
+++ b/browse/type_single.php	2012-05-16 23:46:37 +0000
@@ -18,7 +18,11 @@
 $archfilter = 'None';
 $lsbversion = 'None';
 
-set_distro_filters();
+check_request_literal_params('cmd');
+check_request_literal_params('changeDname');
+check_request_literal_params('changeCompName');
+set_distro_filters($_REQUEST['cmd'], $_REQUEST['changeDname'],
+                   $_REQUEST['changeCompName']);
 
 if( $mode == "admin" ) {
     // In the admin mode, redirect to the 'type.php' page

=== modified file 'commons.inc'
--- a/commons.inc	2012-04-10 18:14:37 +0000
+++ b/commons.inc	2012-05-16 23:46:37 +0000
@@ -893,12 +893,12 @@
 
 include("../tmp_tables.inc");
 
-function set_distro_filters()
+function set_distro_filters($cmd, $changeDname, $changeCompName)
 {
     global $change_link, $curDistr, $curComponent;
 
-    if( $_REQUEST['cmd'] ) {
-        $change_link .= '?cmd='.$_REQUEST['cmd'];
+    if( $cmd ) {
+        $change_link .= '?cmd='.$cmd;
         foreach (array_keys($_REQUEST) as $param) {
             if( ($param != 'cmd') && ($param != 'changeDname')
                     && ($param != 'changeCompName') ) {
@@ -907,28 +907,28 @@
         }
     }
 
-    if( isset($_REQUEST['changeDname']) ) {
-        if( $_REQUEST['changeDname'] == "-1" ) {
+    if( $changeDname ) {
+        if( $changeDname == "-1" ) {
             setcookie("curDistr", "");
             $curDistr = "";
         }
         else {
-            setcookie('curDistr',$_REQUEST['changeDname']);
-            $curDistr = $_REQUEST['changeDname'];
+            setcookie('curDistr', $changeDname);
+            $curDistr = $changeDname;
         }
     }
     else {
         $curDistr = isset($_COOKIE['curDistr']) ? $_COOKIE['curDistr'] : "";
     }
 
-    if( isset($_REQUEST['changeCompName']) ) {
-        if( $_REQUEST['changeCompName'] == "-1" ) {
+    if( $changeCompName ) {
+        if( $changeCompName == "-1" ) {
             setcookie("curComponent", "");
             $curComponent = "";
         }
         else {
-            setcookie('curComponent',$_REQUEST['changeCompName']);
-            $curComponent = $_REQUEST['changeCompName'];
+            setcookie('curComponent',$changeCompName);
+            $curComponent = $changeCompName;
         }
     }
     else {



More information about the lsb-messages mailing list