ftimme
2011-09-19 f927494ece5a230889b9a47abab8a58c2cec0328
server/plugins-available/nginx_plugin.inc.php
@@ -675,22 +675,24 @@
         }
         */
         $rewrite_rules[] = array(   'rewrite_domain'    => $data['new']['domain'],
               'rewrite_type'       => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
               'rewrite_target'    => $data['new']['redirect_path']);
         switch($data['new']['subdomain']) {
            case 'www':
               $rewrite_rules[] = array(   'rewrite_domain'    => 'www.'.$data['new']['domain'],
                     'rewrite_type'       => ($data['new']['redirect_type'] == 'no')?'':'['.$data['new']['redirect_type'].']',
               $rewrite_rules[] = array(   'rewrite_domain'    => '^'.$data['new']['domain'],
               'rewrite_type'       => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
               'rewrite_target'    => $data['new']['redirect_path']);
               $rewrite_rules[] = array(   'rewrite_domain'    => '^www.'.$data['new']['domain'],
                     'rewrite_type'       => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
                     'rewrite_target'    => $data['new']['redirect_path']);
               break;
            case '*':
            // TODO
            //$rewrite_rules[] = array(   'rewrite_domain'    => '*'.$alias['domain'],
            //                     'rewrite_type'       => $alias['redirect_type'],
            //                     'rewrite_target'    => $alias['redirect_path']);
               $rewrite_rules[] = array(   'rewrite_domain'    => $data['new']['domain'],
                  'rewrite_type'       => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
                  'rewrite_target'    => $data['new']['redirect_path']);
               break;
            default:
               $rewrite_rules[] = array(   'rewrite_domain'    => '^'.$data['new']['domain'],
               'rewrite_type'       => ($data['new']['redirect_type'] == 'no')?'':$data['new']['redirect_type'],
               'rewrite_target'    => $data['new']['redirect_path']);
         }
      }
@@ -727,21 +729,25 @@
                  $data['new']['redirect_path'] = $data['new']['document_root'].'/web'.realpath($data['new']['redirect_path']).'/';
               }
               */
               $rewrite_rules[] = array(   'rewrite_domain'    => $alias['domain'],
                     'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':'['.$alias['redirect_type'].']',
                     'rewrite_target'    => $alias['redirect_path']);
               switch($alias['subdomain']) {
                  case 'www':
                     $rewrite_rules[] = array(   'rewrite_domain'    => 'www.'.$alias['domain'],
                           'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':'['.$alias['redirect_type'].']',
                     $rewrite_rules[] = array(   'rewrite_domain'    => '^'.$alias['domain'],
                        'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                        'rewrite_target'    => $alias['redirect_path']);
                     $rewrite_rules[] = array(   'rewrite_domain'    => '^www.'.$alias['domain'],
                           'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                           'rewrite_target'    => $alias['redirect_path']);
                     break;
                  case '*':
                  // TODO
                  //$rewrite_rules[] = array(   'rewrite_domain'    => '*'.$alias['domain'],
                  //                     'rewrite_type'       => $alias['redirect_type'],
                  //                     'rewrite_target'    => $alias['redirect_path']);
                     $rewrite_rules[] = array(   'rewrite_domain'    => $alias['domain'],
                        'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                        'rewrite_target'    => $alias['redirect_path']);
                     break;
                  default:
                     $rewrite_rules[] = array(   'rewrite_domain'    => '^'.$alias['domain'],
                     'rewrite_type'       => ($alias['redirect_type'] == 'no')?'':$alias['redirect_type'],
                     'rewrite_target'    => $alias['redirect_path']);
               }
            }
         }
@@ -1065,7 +1071,7 @@
         return;
      }
      
      if(!@is_file($pool_dir.'/'.$data['new']['domain'].'.conf') || ($data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain'])) {
      //if(!@is_file($pool_dir.'/'.$data['new']['domain'].'.conf') || ($data['old']['domain'] != '' && $data['new']['domain'] != $data['old']['domain'])) {
         if ( @is_file($pool_dir.'/'.$data['old']['domain'].'.conf') ) {
            unlink($pool_dir.'/'.$data['old']['domain'].'.conf');
         }
@@ -1089,11 +1095,48 @@
            $tpl->setVar('enable_php_open_basedir', ';');
         }
         
         // Custom php.ini settings
         $final_php_ini_settings = array();
         $custom_php_ini_settings = trim($data['new']['custom_php_ini']);
         if($custom_php_ini_settings != ''){
            // Make sure we only have Unix linebreaks
            $custom_php_ini_settings = str_replace("\r\n", "\n", $custom_php_ini_settings);
            $custom_php_ini_settings = str_replace("\r", "\n", $custom_php_ini_settings);
            $ini_settings = explode("\n", $custom_php_ini_settings);
            if(is_array($ini_settings) && !empty($ini_settings)){
               foreach($ini_settings as $ini_setting){
                     list($key, $value) = explode('=', $ini_setting);
                     if($value){
                        $value = trim($value);
                        $key = trim($key);
                        switch (strtolower($value)) {
                           case 'on':
                           case 'off':
                           case '1':
                           case '0':
                              // PHP-FPM might complain about invalid boolean value if you use 0
                              $value = 'off';
                           case 'true':
                           case 'false':
                           case 'yes':
                           case 'no':
                              $final_php_ini_settings[] = array('ini_setting' => 'php_admin_flag['.$key.'] = '.$value);
                              break;
                           default:
                              $final_php_ini_settings[] = array('ini_setting' => 'php_admin_value['.$key.'] = '.$value);
                        }
                     }
               }
            }
         }
         $tpl->setLoop('custom_php_ini_settings', $final_php_ini_settings);
         file_put_contents($pool_dir.'/'.$data['new']['domain'].'.conf',$tpl->grab());
         $app->log('Writing the PHP-FPM config file: '.$pool_dir.'/'.$data['new']['domain'].'.conf',LOGLEVEL_DEBUG);
         unset($tpl);
         //$reload = true;
      }
      //}
      //if($reload == true) $app->services->restartService('php-fpm','reload');
   }