Copied files from svn 3.0.5 stable branch (git migration)

Marius Cramer

2013-10-14 992797f73c92b413a7fecff02c27c61b7db55b43

 interface/lib/classes/aps_guicontroller.inc.php

@@ -728,9 +728,8 @@
            // Using parse_url() to filter malformed URLs

            $path = dirname(parse_url($_SERVER['PHP_SELF'], PHP_URL_PATH)).'/'.

                    basename($this->interface_pkg_dir).'/'.$pkg['path'].'/'.basename((string)$icon);

       // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path

       $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path);



         // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path

         $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path);

            $pkg['Icon'] = $path;

        }

        else $pkg['Icon'] = '';

@@ -744,8 +743,8 @@
                // Using parse_url() to filter malformed URLs

                $path = dirname(parse_url($_SERVER['PHP_SELF'], PHP_URL_PATH)).'/'.

                        basename($this->interface_pkg_dir).'/'.$pkg['path'].'/'.basename((string)$screen['path']);

      // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path

      $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path);

            // nginx: if $_SERVER['PHP_SELF'] is doubled, remove /sites/aps_packagedetails_show.php from beginning of path		
            $path = preg_replace('@^/sites/aps_packagedetails_show.php(.*)@', '$1', $path);



                $pkg['Screenshots'][] = array('ScreenPath' => $path,

                                              'ScreenDescription' => htmlspecialchars(trim((string)$screen->description)));

@@ -843,4 +842,4 @@
        return $pkg;

    }

}

?>

?>