Changeset 7730 for trunk/library

Timestamp:

01/11/13 08:48:41 (11 years ago)

Author:

marcieli

Message:

Ticket #3236 - Correcoes de seguranca com base no segundo relatorio emitido.

Location:

trunk/library

Files:

• PEAR/PEAR/Command/Registry.php (modified) (1 diff)
• PEAR/PEAR/PackageFile/Generator/v1.php (modified) (1 diff)
• PEAR/PEAR/PackageFile/v2.php (modified) (1 diff)
• PEAR/PEAR/RunTest.php (modified) (1 diff)
• PEAR/scripts/pearcmd.php (modified) (3 diffs)
• csstidy/class.csstidy_optimise.php (modified) (1 diff)

trunk/library/PEAR/PEAR/Command/Registry.php

@@ -985 +985 @@
                         $info[$infoindex] .= "$type $name";
                         if (isset($package['uri'])) {
-                            $info[$infoindex] .= "\n  Download URI: $package[uri]";
+                            $info[$infoindex] .= "\n  Download URI: {$package['uri']}";
                             continue;
                         }

trunk/library/PEAR/PEAR/PackageFile/Generator/v1.php

@@ -202 +202 @@
         $ret .= "<!DOCTYPE package SYSTEM \"http://pear.php.net/dtd/package-1.0\">\n";
         $ret .= "<package version=\"1.0\" packagerversion=\"1.9.4\">\n" .
-" <name>$pkginfo[package]</name>";
+" <name>{$pkginfo['package']}</name>";
         if (isset($pkginfo['extends'])) {
             $ret .= "\n<extends>{$pkginfo['extends']}</extends>";

trunk/library/PEAR/PEAR/PackageFile/v2.php

@@ -329 +329 @@
         $mymaintainers = $this->getMaintainers();
         $yourmaintainers = $pf1->getMaintainers();
-        $yourmaintainers_count = count($yourmaintainers);
-        for ($i1 = 0; $i1 < $yourmaintainers_count; ++$i1) {
+        for ($i1 = 0; $i1 < count($yourmaintainers); ++$i1) {
             $reset = false;
-            $mymaintainers_count = count($mymaintainers);
-            for ($i2 = 0; $i2 < $mymaintainers_count; ++$i2) {
+            for ($i2 = 0; $i2 < count($mymaintainers); ++$i2) {
                 if ($mymaintainers[$i2]['handle'] == $yourmaintainers[$i1]['handle']) {
                     if ($mymaintainers[$i2]['role'] != $yourmaintainers[$i1]['role']) {

trunk/library/PEAR/PEAR/RunTest.php

@@ -656 +656 @@
             $data .= "
 ---- EXPECTED RETURN
-$section_text[RETURNS]
+{$section_text['RETURNS']}
 ---- ACTUAL RETURN
 $return_value

trunk/library/PEAR/scripts/pearcmd.php

@@ -337 +337 @@
         }
         $put .=
-            "Usage: $progname [options] command [command-options] <parameters>\n".
+            "Usage: $progname ['options'] command ['command-options'] <parameters>\n".
             "Type \"$progname help options\" to list all options.\n".
             "Type \"$progname help shortcuts\" to list all command shortcuts.\n".
@@ -385 +385 @@
     } elseif ($help = PEAR_Command::getHelp($command)) {
         if (is_string($help)) {
-            return "$progname $command [options] $help\n";
+            return "$progname $command ['options'] $help\n";
         }
 
@@ -392 +392 @@
         }
 
-        return "$progname $command [options] $help[0]\n$help[1]";
+        return "$progname $command ['options'] $help[0]\n$help[1]";
     }
 

trunk/library/csstidy/class.csstidy_optimise.php

@@ -302 +302 @@
             $color_tmp = substr($color,4,strlen($color)-5);
             $color_tmp = explode(',',$color_tmp);
-            for ( $i = 0; $i < count($color_tmp); ++$i )
+            $color_tmp_count = count($color_tmp);
+            for ( $i = 0; $i < $color_tmp_count; ++$i )
             {
                 $color_tmp[$i] = trim ($color_tmp[$i]);