- Fixed FS#2813 - Missing APS package icons and screenshots.

ftimme

2013-03-19 702b2377ac32645ed89ebb712d3752d8f72505eb

- Fixed FS#2813 - Missing APS package icons and screenshots.

 install/tpl/nginx_apps.vhost.master

@@ -46,7 +46,7 @@
               fastcgi_pass unix:{fpm_socket};
               fastcgi_index index.php;
               fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
               fastcgi_param PATH_INFO $fastcgi_script_name;
               #fastcgi_param PATH_INFO $fastcgi_script_name;
               fastcgi_buffer_size 128k;
               fastcgi_buffers 256 4k;
               fastcgi_busy_buffers_size 256k;

 install/tpl/nginx_ispconfig.vhost.master

@@ -28,7 +28,7 @@
               fastcgi_pass unix:{fpm_socket};
               fastcgi_index index.php;
               fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
               fastcgi_param PATH_INFO $fastcgi_script_name;
               #fastcgi_param PATH_INFO $fastcgi_script_name;
               fastcgi_buffer_size 128k;
               fastcgi_buffers 256 4k;
               fastcgi_busy_buffers_size 256k;

 interface/lib/classes/aps_guicontroller.inc.php

@@ -728,6 +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);

            $pkg['Icon'] = $path;

        }

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

@@ -741,6 +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);



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

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


 server/conf/nginx_apps.vhost.master

@@ -46,7 +46,7 @@
               fastcgi_pass unix:{fpm_socket};
               fastcgi_index index.php;
               fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
               fastcgi_param PATH_INFO $fastcgi_script_name;
               #fastcgi_param PATH_INFO $fastcgi_script_name;
               fastcgi_buffer_size 128k;
               fastcgi_buffers 256 4k;
               fastcgi_busy_buffers_size 256k;