Changeset 7681 for trunk/phpgwapi/inc/class.vfs_dav.inc.php

Timestamp:

12/19/12 16:44:18 (11 years ago)

Author:

douglasz

Message:

Ticket #3236 - Correcoes para Best Practice: Short Open Tag e Best Practice: Always Quote Array Keys.

File:

• trunk/phpgwapi/inc/class.vfs_dav.inc.php (modified) (4 diffs)

trunk/phpgwapi/inc/class.vfs_dav.inc.php

@@ -585 +585 @@
                                 while (list ($num, $link_info) = each ($this->linked_dirs))
                                 {
-                                        if (preg_match("/^$link_info[directory]\/$link_info[name](\/|$)/", $rarray['fake_full_path']))
+                                        if (preg_match("/^{$link_info['directory']}\/{$link_info['name']}(\/|$)/", $rarray['fake_full_path']))
                                         {
                                                 $rarray['real_full_path'] = preg_replace("/^$this->basedir/", '', $rarray['real_full_path']);
-                                                $rarray['real_full_path'] = preg_replace("/^$link_info[directory]" . SEP . "$link_info[name]/", $link_info['link_directory'] . SEP . $link_info['link_name'], $rarray['real_full_path']);
+                                                $rarray['real_full_path'] = preg_replace("/^{$link_info['directory']}" . SEP . "{$link_info['name']}/", $link_info['link_directory'] . SEP . $link_info['link_name'], $rarray['real_full_path']);
 
                                                 $p = $this->path_parts (array(
@@ -643 +643 @@
 
 /*
-                        echo "<br>fake_full_path: $rarray[fake_full_path]
-                                <br>fake_leading_dirs: $rarray[fake_leading_dirs]
-                                <br>fake_extra_path: $rarray[fake_extra_path]
-                                <br>fake_name: $rarray[fake_name]
-                                <br>real_full_path: $rarray[real_full_path]
-                                <br>real_full_url: $rarray[real_full_url]
-                                <br>real_leading_dirs: $rarray[real_leading_dirs]
-                                <br>real_extra_path: $rarray[real_extra_path]
-                                <br>real_name: $rarray[real_name]";
+                        echo "<br>fake_full_path: {$rarray['fake_full_path']}
+                                <br>fake_leading_dirs: {$rarray['fake_leading_dirs']}
+                                <br>fake_extra_path: {$rarray['fake_extra_path']}
+                                <br>fake_name: {$rarray['fake_name']}
+                                <br>real_full_path: {$rarray['real_full_path']}
+                                <br>real_full_url: {$rarray['real_full_url']}
+                                <br>real_leading_dirs: {$rarray['real_leading_dirs']}
+                                <br>real_extra_path: {$rarray['real_extra_path']}
+                                <br>real_name: {$rarray['real_name']}";
 */
 
@@ -1681 +1681 @@
                                         $newdir = preg_replace("/^$f->fake_full_path/", "$t->fake_full_path", $entry['directory']);
                                         $this->cp (array(
-                                                        'from'  => "$entry[directory]/$entry[name]",
-                                                        'to'    => "$newdir/$entry[name]",
+                                                        'from'  => "$entry[directory]/{$entry['name']}",
+                                                        'to'    => "$newdir/{$entry['name']}",
                                                         'relatives'     => array ($f->mask, $t->mask)
                                                 )
@@ -1951 +1951 @@
                                 {
                                         $this->rm (array(
-                                                        'string'        => "$entry[directory]/$entry[name]",
+                                                        'string'        => "{$entry['directory']}/{$entry['name']}",
                                                         'relatives'     => array ($p->mask)
                                                 )