Changeset 12901

Show
Ignore:
Timestamp:
11/01/11 06:19:04 (2 years ago)
Author:
tm1000
Message:

Merge branch 'develop' into freepbx210_local

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.10/endpointman/assets/theme/reset.css

    r11804 r12901  
    1 /*  
    2   Using a customized version of Eric Meyer's CSS Reset to give us an even, cross-browser playing field. More info: 
    3   http://meyerweb.com/eric/thoughts/2007/05/01/reset-reloaded/ 
    4 */ 
    5  
    6 html, body, div, span, applet, object, iframe, 
    7 h1, h2, h3, h4, h5, h6, p, blockquote, pre, 
    8 a, abbr, acronym, address, big, cite, code, 
    9 del, dfn, em, font, img, ins, kbd, q, s, samp, 
    10 small, strike, strong, sub, sup, tt, var, 
    11 b, u, i, center, 
    12 dl, dt, dd, ol, ul, li, 
    13 fieldset, form, label, legend, 
    14 table, caption, tbody, tfoot, thead, tr, th, td { 
    15   background: transparent; 
    16   border: 0; 
    17   font-size: 99%; 
    18   font-family: Arial; 
    19   margin: 0; 
    20   outline: 0; 
    21   padding: 0; 
    22   vertical-align: baseline; 
    23 } 
    24 body { 
    25   line-height: 1.2; 
    26 } 
    27 ol, ul { 
    28   margin-left: 25px; 
    29 } 
    30  
    31 :focus { 
    32   outline: 1px #c0c dotted; 
    33 } 

  • modules/branches/2.10/endpointman/install.php

    r12900 r12901  
    12351235 
    12361236$sql = 'SELECT value FROM `admin` WHERE `variable` LIKE CONVERT(_utf8 \'version\' USING latin1) COLLATE latin1_swedish_ci'; 
    1237 $amp_version = $db->getOne($sql); 
     1237preg_match('/^(\d*)\.(\d*)/', $db->getOne($sql), $versions); 
     1238 
     1239$amp_version['minor'] = $versions[2]; 
    12381240 
    12391241if(file_exists($amp_conf['AMPWEBROOT']."/recordings/modules/phonesettings.module")) { 
    …… 
    12531255} 
    12541256 
    1255 if($amp_version < "2.9.0") { 
     1257if($amp_version['minor'] < 9) { 
    12561258    //Do symlinks ourself because retrieve_conf is OLD 
    12571259 

  • modules/branches/2.10/endpointman/uninstall.php

    r12366 r12901  
    9090} 
    9191 
     92//javascripts 
     93$dir = $amp_conf['AMPWEBROOT'].'/admin/assets/endpointman/css'; 
     94foreach (glob(LOCAL_PATH."assets/css/*.*") as $filename) { 
     95    if(file_exists($dir.'/'.basename($filename)) && (readlink($dir.'/'.basename($filename)) == $filename)) { 
     96        unlink($dir.'/'.basename($filename)); 
     97    } 
     98} 
     99if(is_link($dir)) { 
     100    unlink($dir); 
     101} 
     102 
    92103//theme 
    93104$dir = $amp_conf['AMPWEBROOT'].'/admin/assets/endpointman/theme';