Show
Ignore:
Timestamp:
12/16/11 22:26:59 (1 year ago)
Author:
p_lindheimer
Message:

Merged revisions 13073,13078-13079,13081 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.10

........

r13078 | p_lindheimer | 2011-12-16 12:41:06 -0800 (Fri, 16 Dec 2011) | 1 line


bootstrap already includes these modules don't include them again

........

r13081 | p_lindheimer | 2011-12-16 19:20:02 -0800 (Fri, 16 Dec 2011) | 1 line


this is for freepbx_engine and amportal which must be root to run

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.9

    • Property svn:mergeinfo changed from /freepbx/branches/2.10:13075-13076 to /freepbx/branches/2.10:13073,13075-13076,13078-13081
    • Property svnmerge-integrated changed from /freepbx/branches/2.8:1-11479,12035 /freepbx/branches/2.10:1-12618,12932,13075-13076 to /freepbx/branches/2.8:1-11479,12035 /freepbx/branches/2.10:1-12618,12932,13073-13081

  • freepbx/branches/2.9/amp_conf/bin/gen_amp_conf.php

    r10865 r13082  
    11#!/usr/bin/php -q 
    22<?php 
     3  $current_user = posix_getpwuid(posix_geteuid()); 
     4  if ($current_user['uid'] !== 0) { 
     5    die('Forbidden - must be root'); 
     6  } 
    37  // Generate the a list of variables that can be sourced by 
    48  // a bash script 

  • freepbx/branches/2.9/amp_conf/htdocs/recordings/includes/common.php

    r11671 r13082  
    453453include_once("./includes/ajax.php"); 
    454454include_once("./includes/callme.php"); 
    455 include_once("../admin/functions.inc.php"); 
    456 include_once("../admin/libraries/php-asmanager.php"); 
    457455 
    458456?>