Florian Schaal
2015-03-28 59c1b4f7dbb110b3d5c0942201f53e8229ef6a33
Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3
4 files modified
14 ■■■■ changed files
install/tpl/nginx_apps.vhost.master 2 ●●● patch | view | raw | blame | history
install/tpl/nginx_ispconfig.vhost.master 2 ●●● patch | view | raw | blame | history
interface/lib/classes/aps_crawler.inc.php 9 ●●●● patch | view | raw | blame | history
server/scripts/ispconfig_patch 1 ●●●● patch | view | raw | blame | history
install/tpl/nginx_apps.vhost.master
@@ -12,7 +12,7 @@
        }
        # serve static files directly
        location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
        location ~* ^.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
               access_log        off;
        }
install/tpl/nginx_ispconfig.vhost.master
@@ -19,7 +19,7 @@
        }
        # serve static files directly
        location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
        location ~* ^.+\.(jpg|jpeg|gif|css|png|js|ico|html|xml|txt)$ {
               access_log        off;
        }
interface/lib/classes/aps_crawler.inc.php
@@ -189,7 +189,8 @@
            curl_setopt($conn[$i], CURLOPT_TIMEOUT, 0);
            curl_setopt($conn[$i], CURLOPT_FAILONERROR, 1);
            curl_setopt($conn[$i], CURLOPT_FOLLOWLOCATION, 1);
            curl_setopt($conn[$i], CURLOPT_SSL_VERIFYPEER, 0);
            curl_setopt($conn[$i], CURLOPT_SSL_VERIFYHOST, 1);
            curl_setopt($conn[$i], CURLOPT_SSL_VERIFYPEER, false);
            curl_multi_add_handle($mh, $conn[$i]);
        }
@@ -284,6 +285,7 @@
                    $apps_count = substr_count($apps[$j], '<opensearch:totalResults>0</opensearch:totalResults>');
                    if($apps_count == 0) // obviously this vendor provides one or more apps
                        {
                        try {
                        // Rename namespaces and register them
                        $xml = str_replace("xmlns=", "ns=", $apps[$j]);
                        $sxe = new SimpleXMLElement($xml);
@@ -457,6 +459,11 @@
                        unset($sxe);
                        $apps_in_repo++;
                        } catch (Exception $e) {
                            // We dont want the crawler to fail on xml parse errors
                            $app->log($this->log_prefix.$e->getMessage(), LOGLEVEL_WARN);
                            //echo 'Caught exception: ',  $e->getMessage(), "\n";
                        }
                    }
                }
                //var_dump($apps);
server/scripts/ispconfig_patch
@@ -102,6 +102,7 @@
if(!is_installed('patch')) {
    swriteln("The program 'patch' is missing on your server. Please install it and try again.");
    exit;
}
$patch_id = simple_query('Enter patch id', false, '');