Changeset 12757

Show
Ignore:
Timestamp:
10/04/11 21:41:44 (2 years ago)
Author:
p_lindheimer
Message:

adds notice for browser stats collection, adds setting for freepbx_menu.conf, move several new settings to propeper location

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • freepbx/branches/2.10/amp_conf/astetc/freepbx_menu.conf.template

    r10122 r12757  
    1 ; This is an optional configuration file used to rearrange your left navigation  
    2 ; bar in the FreePBX GUI. To enable it, change the name to freepbx_menu.conf and put 
     1; This is an optional configuration file used to rearrange your menu navigation 
     2; in the FreePBX GUI. To enable it, change the name to freepbx_menu.conf and put 
    33; in the desired configuration. Lines starting with ";" are comments. 
     4; You must also enable the Advanced Setting "Use freepbx_menu.conf Configuration" 
    45; 
    56; It provdes the followming options: 
     
    89; - Create New Categories 
    910; - Rename the item 
    10 ; - Change the tab items appear in between setup and tool 
    1111; - Remove menu items that you don't want displayed 
    1212; - Change the sort order of items 
    1313; 
    1414; If you create a new cateogry called "Favorites" it will 
    15 ; be placed right under the Admin Category in the left navigation 
    16 ; bar. 
     15; be the first tab, all others are alphabetical. 
    1716; 
    1817; The following examples provide you with a demonstration of how you 
    1918; might go about changing a setup. 
    2019; 
    21 ; There is no 'permanent' change made by invoking this file, if the 
    22 ; system finds the file freepbx_menu.conf it will parse it as an 
    23 ; ini formated file and make the requested changes to the format 
    24 ; 
    2520; [extensions] 
    26 ; type=setup 
    2721; category=Favorites 
    2822 
    2923; [findmefollow] 
    30 ; type=setup 
    3124; category=Favorites 
    3225; name=Find-Me Follow 
    3326 
    3427; [fax] 
    35 ; type=setup 
    3628; category=Media 
    3729 
    3830; [recordings] 
    39 ; type=setup 
    4031; category=Media 
    4132 
    4233; [music] 
    43 ; type=setup 
    4434; category=Media 
    4535; sort=-9 
  • freepbx/branches/2.10/amp_conf/bin/retrieve_conf

    r12651 r12757  
    335335} 
    336336 
     337 
    337338//Putting the core module last, to move outbound-allroutes  
    338339// last in from-internals-additional 
     
    415416$version = $engineinfo['version']; 
    416417$chan_dahdi = ast_with_dahdi(); 
     418 
     419// If BROWSER_STATS is set to true (default) and we have never provided a notice (NOTICE_BROWSER_STATS false) then do so one time only so 
     420// they are aware and can choose to opt out. 
     421if (!$amp_conf['NOTICE_BROWSER_STATS'] && $amp_conf['BROWSER_STATS']) { 
     422  $nt->add_notice('framework', 'BROWSER_STATS', _("Collecting Anonymous Browser Stats"), _("The FreePBX project is collecting anonymous browser statistics using google analytics. These are used to focus development efforts based on real user input. All information is anonymous. You can disable this in Advanced Settings with the Browser Stats setting.")); 
     423  $freepbx_conf->set_conf_values(array('NOTICE_BROWSER_STATS' => true), true, true); 
     424} 
     425 
    417426 
    418427if (!$freepbx_conf->conf_setting_exists('AST_FUNC_DEVICE_STATE')) { 
  • freepbx/branches/2.10/amp_conf/htdocs/admin/assets/css/mainstyle-rtl.css

    r12649 r12757  
    2222  right:60px; 
    2323} 
    24 #BRAND_IMAGE_FREEPBX_LEFT { 
     24#BRAND_IMAGE_TANGO_LEFT { 
    2525  float: right; 
    2626} 
  • freepbx/branches/2.10/amp_conf/htdocs/admin/assets/css/mainstyle.css

    r12713 r12757  
    383383 
    384384/* menubar logo */ 
    385 #BRAND_IMAGE_FREEPBX_LEFT { 
     385#BRAND_IMAGE_TANGO_LEFT { 
    386386  height:23px; 
    387387  margin:4px; 
  • freepbx/branches/2.10/amp_conf/htdocs/admin/assets/js/pbxlib.js.php

    r12732 r12757  
    131131$('.rnav > ul').menu();$('.radioset').buttonset();$('.menubar').show().menubar();$('.module_menu_button').hover(function(){$(this).click()},function(){});if(fpbx.conf.reload_needed){toggle_reload_button('show');} 
    132132$('.sortable').menu();$('.ui-menu-item').click(function(){go=$(this).find('a').attr('href');if(go&&!$(this).find('a').hasClass('ui-state-disabled')){document.location.href=go;}}) 
    133 $('#button_reload').click(function(){if(fpbx.conf.RELOADCONFIRM=='true'){fpbx_reload_confirm();}else{fpbx_reload();}});$('#BRAND_IMAGE_FREEPBX_LEFT').click(function(){window.open($(this).data('brand_image_freepbx_link_left'),'_newtab');});$('input[type=submit],input[type=button], button, input[type=reset]').each(function(){var prim=(typeof $(this).data('button-icon-primary')=='undefined')?'':($(this).data('button-icon-primary'));var sec=(typeof $(this).data('button-icon-secondary')=='undefined')?'':($(this).data('button-icon-secondary'));var txt=(typeof $(this).data('button-text')=='undefined')?'true':($(this).data('button-text'));var txt=(txt=='true')?true:false;$(this).button({icons:{primary:prim,secondary:sec},text:txt});});$(document).bind('keydown','meta+shift+a',function(){$('#modules_button').trigger('click');});$(document).bind('keydown','meta+shift+s',function(){});$(document).bind('keydown','meta+shift+x',function(){});$('#user_logout').click(function(){url=window.location.pathname;$.get(url+'?logout=true',function(){$.cookie('PHPSESSID',null);window.location=url;});});}); 
     133$('#button_reload').click(function(){if(fpbx.conf.RELOADCONFIRM=='true'){fpbx_reload_confirm();}else{fpbx_reload();}});$('#BRAND_IMAGE_TANGO_LEFT').click(function(){window.open($(this).data('brand_image_freepbx_link_left'),'_newtab');});$('input[type=submit],input[type=button], button, input[type=reset]').each(function(){var prim=(typeof $(this).data('button-icon-primary')=='undefined')?'':($(this).data('button-icon-primary'));var sec=(typeof $(this).data('button-icon-secondary')=='undefined')?'':($(this).data('button-icon-secondary'));var txt=(typeof $(this).data('button-text')=='undefined')?'true':($(this).data('button-text'));var txt=(txt=='true')?true:false;$(this).button({icons:{primary:prim,secondary:sec},text:txt});});$(document).bind('keydown','meta+shift+a',function(){$('#modules_button').trigger('click');});$(document).bind('keydown','meta+shift+s',function(){});$(document).bind('keydown','meta+shift+x',function(){});$('#user_logout').click(function(){url=window.location.pathname;$.get(url+'?logout=true',function(){$.cookie('PHPSESSID',null);window.location=url;});});}); 
    134134(function(jQuery){jQuery.hotkeys={version:"0.8",specialKeys:{8:"backspace",9:"tab",13:"return",16:"shift",17:"ctrl",18:"alt",19:"pause",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"insert",46:"del",96:"0",97:"1",98:"2",99:"3",100:"4",101:"5",102:"6",103:"7",104:"8",105:"9",106:"*",107:"+",109:"-",110:".",111:"/",112:"f1",113:"f2",114:"f3",115:"f4",116:"f5",117:"f6",118:"f7",119:"f8",120:"f9",121:"f10",122:"f11",123:"f12",144:"numlock",145:"scroll",191:"/",224:"meta"},shiftNums:{"`":"~","1":"!","2":"@","3":"#","4":"$","5":"%","6":"^","7":"&","8":"*","9":"(","0":")","-":"_","=":"+",";":": ","'":"\"",",":"<",".":">","/":"?","\\":"|"}};function keyHandler(handleObj){if(typeof handleObj.data!=="string"){return;} 
    135135var origHandler=handleObj.handler,keys=handleObj.data.toLowerCase().split(" ");handleObj.handler=function(event){if(this!==event.target&&(/textarea|select/i.test(event.target.nodeName)||event.target.type==="text")){return;} 
  • freepbx/branches/2.10/amp_conf/htdocs/admin/assets/js/script.legacy.js

    r12732 r12757  
    783783   
    784784  //logo icon 
    785   $('#BRAND_IMAGE_FREEPBX_LEFT').click(function(){ 
     785  $('#BRAND_IMAGE_TANGO_LEFT').click(function(){ 
    786786    window.open($(this).data('brand_image_freepbx_link_left'),'_newtab'); 
    787787  }); 
  • freepbx/branches/2.10/amp_conf/htdocs/admin/views/menu.php

    r12731 r12757  
    77$out .= '<div class="menubar ui-widget-header ui-corner-all">'; 
    88//left hand logo 
    9 $out .= '<img src="' . $amp_conf['BRAND_IMAGE_FREEPBX_LEFT']  
    10     . '" alt="FreePBX" title="FreePBX" id="BRAND_IMAGE_FREEPBX_LEFT" ' 
     9$out .= '<img src="' . $amp_conf['BRAND_IMAGE_TANGO_LEFT']  
     10    . '" alt="FreePBX" title="FreePBX" id="BRAND_IMAGE_TANGO_LEFT" ' 
    1111    . 'data-BRAND_IMAGE_FREEPBX_LINK_LEFT="' . $amp_conf['BRAND_IMAGE_FREEPBX_LINK_LEFT'] . '"/ />'; 
    1212     
    1313// If freepbx_menu.conf exists then use it to define/redefine categories 
    1414// 
    15 $fd = $amp_conf['ASTETCDIR'].'/freepbx_menu.conf'; 
    16 if (file_exists($fd)) { 
    17   $favorites = parse_ini_file($fd,true); 
    18   if ($favorites !== false) foreach ($favorites as $menuitem => $setting) { 
    19     if (isset($fpbx_menu[$menuitem])) { 
    20       foreach($setting as $key => $value) { 
    21         switch ($key) { 
    22           case 'category': 
    23           case 'name': 
    24             $fpbx_menu[$menuitem][$key] = htmlspecialchars($value); 
    25           break; 
    26           case 'type': 
    27             // this is really deprecated but ??? 
    28             if (strtolower($value)=='setup' || strtolower($value)=='tool') { 
    29               $fpbx_menu[$menuitem][$key] = strtolower($value); 
    30             } 
    31           break; 
    32           case 'sort': 
    33             if (is_numeric($value) && $value > -10 && $value < 10) { 
    34               $fpbx_menu[$menuitem][$key] = $value; 
    35             } 
    36           break; 
    37           case 'remove': 
    38             // parse_ini_file sets all forms of yes/true to 1 and no/false to nothing 
    39             if ($value == '1') { 
    40               unset($fpbx_menu[$menuitem]); 
    41             } 
    42           break; 
     15if ($amp_conf['USE_FREEPBX_MENU_CONF']) { 
     16  $fd = $amp_conf['ASTETCDIR'].'/freepbx_menu.conf'; 
     17  if (file_exists($fd)) { 
     18    $favorites = parse_ini_file($fd,true); 
     19    if ($favorites !== false) foreach ($favorites as $menuitem => $setting) { 
     20      if (isset($fpbx_menu[$menuitem])) { 
     21        foreach($setting as $key => $value) { 
     22          switch ($key) { 
     23            case 'category': 
     24            case 'name': 
     25              $fpbx_menu[$menuitem][$key] = htmlspecialchars($value); 
     26            break; 
     27            case 'type': 
     28              // this is really deprecated but ??? 
     29              if (strtolower($value)=='setup' || strtolower($value)=='tool') { 
     30                $fpbx_menu[$menuitem][$key] = strtolower($value); 
     31              } 
     32            break; 
     33            case 'sort': 
     34              if (is_numeric($value) && $value > -10 && $value < 10) { 
     35                $fpbx_menu[$menuitem][$key] = $value; 
     36              } 
     37            break; 
     38            case 'remove': 
     39              // parse_ini_file sets all forms of yes/true to 1 and no/false to nothing 
     40              if ($value == '1') { 
     41                unset($fpbx_menu[$menuitem]); 
     42              } 
     43            break; 
     44          } 
    4345        } 
    4446      } 
  • freepbx/branches/2.10/libfreepbx.install.php

    r12549 r12757  
    743743  $set['level'] = 0; 
    744744 
     745  // BROWSER_STATS 
     746  $set['value'] = true; 
     747  $set['options'] = ''; 
     748  $set['name'] = 'Browser Stats'; 
     749  $set['description'] = 'Setting this to true will allow the development team to use google analytics to anonymously analyze browser information to help make better development decision.'; 
     750  $set['emptyok'] = 0; 
     751  $set['readonly'] = 0; 
     752  $set['type'] = CONF_TYPE_BOOL; 
     753  $freepbx_conf->define_conf_setting('BROWSER_STATS',$set); 
     754 
     755 
     756 
    745757  // 
    746758  // CATEGORY: Dialplan and Operational 
     
    12201232  $set['level'] = 0; 
    12211233 
     1234// USE_FREEPBX_MENU_CONF 
     1235  $set['value'] = false; 
     1236  $set['options'] = ''; 
     1237  $set['name'] = 'Use freepbx_menu.conf Configuration'; 
     1238  $set['description'] = 'When set to true, the system will check for a freepbx_menu.conf file amongst the normal configuraiton files and if found, it will be used to define and remap the menu tabs and contents. See the template supplied with FreePBX for details on how to do this.'; 
     1239  $set['emptyok'] = 0; 
     1240  $set['level'] = 0; 
     1241  $set['readonly'] = 0; 
     1242  $set['type'] = CONF_TYPE_BOOL; 
     1243  $freepbx_conf->define_conf_setting('USE_FREEPBX_MENU_CONF',$set); 
     1244  $set['level'] = 0; 
     1245 
     1246 
    12221247  // 
    12231248  // CATEGORY: Asterisk Manager 
     
    14231448  $set['type'] = CONF_TYPE_BOOL; 
    14241449  $freepbx_conf->define_conf_setting('MODULEADMIN_SKIP_CACHE',$set); 
     1450 
     1451  // buffering_callback 
     1452  $set['value'] = 'ob_gzhandler'; 
     1453  $set['options'] = ''; 
     1454  $set['name'] = 'ob_start callback'; 
     1455  $set['description'] = 'This is the callback that will be passed to ob_start. In its default state, ob_gzhandler will be passed which will case all data passed directly by the system to be compressed set this to be blank or something else if this creates issues.'; 
     1456  $set['emptyok'] = 1; 
     1457  $set['readonly'] = 1; 
     1458  $set['hidden'] = 1; 
     1459  $set['type'] = CONF_TYPE_TEXT; 
     1460  $freepbx_conf->define_conf_setting('buffering_callback',$set); 
    14251461 
    14261462 
     
    16111647  $freepbx_conf->define_conf_setting('BRAND_IMAGE_FREEPBX_RIGHT',$set); 
    16121648 
    1613   // BRAND_IMAGE_FREEPBX_LEFT 
    1614   $set['value'] = 'images/freepbx_large.png'; 
     1649  // BRAND_IMAGE_TANGO_LEFT 
     1650  $set['value'] = 'images/tango.png'; 
    16151651  $set['options'] = ''; 
    16161652  $set['name'] = 'Image: Left Upper'; 
     
    16201656  $set['type'] = CONF_TYPE_TEXT; 
    16211657  $set['emptyok'] = 0; 
    1622   $freepbx_conf->define_conf_setting('BRAND_IMAGE_FREEPBX_LEFT',$set); 
     1658  $freepbx_conf->define_conf_setting('BRAND_IMAGE_TANGO_LEFT',$set); 
    16231659 
    16241660  // BRAND_IMAGE_FREEPBX_FOOT 
     
    16671703 
    16681704  // BRAND_FREEPBX_ALT_FOOT 
    1669   $set['value'] = ''; 
     1705  $set['value'] = 'FreePBX&reg;'; 
    16701706  $set['options'] = ''; 
    16711707  $set['name'] = 'Alt for Footer Logo'; 
     
    16781714 
    16791715  // BRAND_IMAGE_FREEPBX_LINK_LEFT 
    1680   $set['value'] = ''; 
     1716  $set['value'] = 'http://www.freepbx.org'; 
    16811717  $set['options'] = ''; 
    16821718  $set['name'] = 'Link for Left Logo'; 
     
    17001736 
    17011737  // BRAND_IMAGE_FREEPBX_LINK_FOOT 
    1702   $set['value'] = ''; 
     1738  $set['value'] = 'http://www.freepbx.org'; 
    17031739  $set['options'] = ''; 
    17041740  $set['name'] = 'Link for Footer Logo'; 
     
    19331969  $freepbx_conf->define_conf_setting('VIEW_REPORTS',$set); 
    19341970  $set['hidden'] = 0; 
     1971 
     1972  // VIEW_MENU 
     1973  $set['value'] = 'views/menu.php'; 
     1974  $set['options'] = ''; 
     1975  $set['name'] = 'View: menu.php'; 
     1976  $set['description'] = 'menu.php view. This should never be changed except for very advanced layout changes'; 
     1977  $set['readonly'] = 1; 
     1978  $set['emptyok'] = 0; 
     1979  $set['hidden'] = 1; 
     1980  $set['sortorder'] = 310; 
     1981  $set['type'] = CONF_TYPE_TEXT; 
     1982  $freepbx_conf->define_conf_setting('VIEW_MENU', $set); 
     1983 
     1984  // JQUERY_CSS 
     1985  $set['value'] = 'assets/css/jquery-ui.css'; 
     1986  $set['options'] = ''; 
     1987  $set['name'] = 'jQuery UI css'; 
     1988  $set['description'] = 'css file for jquery ui'; 
     1989  $set['readonly'] = 1; 
     1990  $set['emptyok'] = 0; 
     1991  $set['hidden'] = 1; 
     1992  $set['sortorder'] = 320; 
     1993  $set['type'] = CONF_TYPE_TEXT; 
     1994  $freepbx_conf->define_conf_setting('JQUERY_CSS', $set); 
     1995 
     1996  // VIEW_LOGIN 
     1997  $set['value'] = 'views/login.php'; 
     1998  $set['options'] = ''; 
     1999  $set['name'] = 'View: login.php'; 
     2000  $set['description'] = 'login.php view. This should never be changed except for very advanced layout changes'; 
     2001  $set['readonly'] = 1; 
     2002  $set['emptyok'] = 0; 
     2003  $set['hidden'] = 1; 
     2004  $set['sortorder'] = 330; 
     2005  $set['type'] = CONF_TYPE_TEXT; 
     2006  $freepbx_conf->define_conf_setting('VIEW_LOGIN', $set); 
     2007 
     2008  // VIEW_HEADER 
     2009  $set['value'] = 'views/header.php'; 
     2010  $set['options'] = ''; 
     2011  $set['name'] = 'View: header.php'; 
     2012  $set['description'] = 'header.php view. This should never be changed except for very advanced layout changes'; 
     2013  $set['readonly'] = 1; 
     2014  $set['emptyok'] = 0; 
     2015  $set['hidden'] = 1; 
     2016  $set['sortorder'] = 340; 
     2017  $set['type'] = CONF_TYPE_TEXT; 
     2018  $freepbx_conf->define_conf_setting('VIEW_HEADER', $set); 
     2019 
     2020  // VIEW_FOOTER 
     2021  $set['value'] = 'views/footer.php'; 
     2022  $set['options'] = ''; 
     2023  $set['name'] = 'View: freepbx.php'; 
     2024  $set['description'] = 'footer.php view. This should never be changed except for very advanced layout changes'; 
     2025  $set['readonly'] = 1; 
     2026  $set['emptyok'] = 0; 
     2027  $set['hidden'] = 1; 
     2028  $set['sortorder'] = 350; 
     2029  $set['type'] = CONF_TYPE_TEXT; 
     2030  $freepbx_conf->define_conf_setting('VIEW_FOOTER', $set); 
     2031 
     2032  // VIEW_FOOTER_CONTENT 
     2033  $set['value'] = 'views/footer_content.php'; 
     2034  $set['options'] = ''; 
     2035  $set['name'] = 'View: footer_content.php'; 
     2036  $set['description'] = 'footer_content.php view. This should never be changed except for very advanced layout changes'; 
     2037  $set['readonly'] = 1; 
     2038  $set['emptyok'] = 0; 
     2039  $set['hidden'] = 1; 
     2040  $set['sortorder'] = 360; 
     2041  $set['type'] = CONF_TYPE_TEXT; 
     2042  $freepbx_conf->define_conf_setting('VIEW_FOOTER_CONTENT', $set); 
     2043 
     2044  // BRAND_ALT_JS 
     2045  $set['value'] = ''; 
     2046  $set['options'] = ''; 
     2047  $set['name'] = 'Alternate JS'; 
     2048  $set['description'] = 'Alternate JS file, to supplement legacy.script.js'; 
     2049  $set['readonly'] = 1; 
     2050  $set['emptyok'] = 1; 
     2051  $set['hidden'] = 1; 
     2052  $set['sortorder'] = 360; 
     2053  $set['type'] = CONF_TYPE_TEXT; 
     2054  $freepbx_conf->define_conf_setting('BRAND_ALT_JS', $set); 
    19352055 
    19362056 
     
    20832203  $set['sortorder'] = 110; 
    20842204  $freepbx_conf->define_conf_setting('DEVICE_PICKUPGROUP',$set); 
     2205 
     2206 
     2207  // 
     2208  // CATEGORY: Internal Use 
     2209  // 
     2210  $set['category'] = 'Internal Use'; 
     2211  $set['level'] = 10; 
     2212 
     2213  // MODULE_REPO 
     2214  $set['value'] = 'http://mirror.freepbx.org'; 
     2215  $set['options'] = ''; 
     2216  $set['name'] = 'Repo Server'; 
     2217  $set['description'] = 'repo server'; 
     2218  $set['readonly'] = 1; 
     2219  $set['hidden'] = 1; 
     2220  $set['type'] = CONF_TYPE_TEXT; 
     2221  $set['emptyok'] = 0; 
     2222  $freepbx_conf->define_conf_setting('MODULE_REPO',$set); 
     2223 
     2224  // NOTICE_BROWSER_STATS 
     2225  $set['value'] = false; 
     2226  $set['options'] = ''; 
     2227  $set['name'] = 'Browser Stats Notice'; 
     2228  $set['description'] = 'Internal use to track if notice has been given that anonyous browser stats are being collected.'; 
     2229  $set['emptyok'] = 0; 
     2230  $set['readonly'] = 1; 
     2231  $set['hidden'] = 1; 
     2232  $set['type'] = CONF_TYPE_BOOL; 
     2233  $freepbx_conf->define_conf_setting('NOTICE_BROWSER_STATS',$set); 
     2234 
    20852235 
    20862236  // The following settings are used in various modules prior to 2.9. If they are found in amportal.conf then we 
  • freepbx/branches/2.10/upgrades/2.10alpha1/migration.php

    r12716 r12757  
    44include_once ($amp_conf['AMPWEBROOT'].'/admin/libraries/freepbx_conf.class.php'); 
    55$freepbx_conf =& freepbx_conf::create(); 
    6 $set = array( 
    7     'value'     => 'ob_gzhandler', 
    8     'defaultval'  => 'ob_gzhandler', 
    9     'readonly'    => 1, 
    10     'hidden'    => 1, 
    11     'level'     => 6, 
    12     'module'    => '', 
    13     'category'    => 'Developer and Customization', 
    14     'emptyok'   => 1, 
    15     'name'      => 'ob_start callback', 
    16     'description' => 'This is the callback that will be passed to ob_start.' 
    17             . ' In its default state, ob_gzhandler will be passed which will' 
    18             . ' case all data passed directly by the system to be compressed' 
    19             . ' set this to be blank or something else if this creates issues.', 
    20     'type'      => CONF_TYPE_TEXT 
    21 ); 
    22 $freepbx_conf->define_conf_setting('buffering_callback', $set); 
    236 
    24 $set = array( 
    25     'value'     => 'http://mirror.freepbx.org', 
    26     'defaultval'  => 'http://mirror.freepbx.org', 
    27     'readonly'    => 1, 
    28     'hidden'    => 1, 
    29     'level'     => 10, 
    30     'module'    => '', 
    31     'category'    => 'Internal Use', 
    32     'emptyok'   => 0, 
    33     'name'      => 'repo server', 
    34     'description' => 'repo server', 
    35     'type'      => CONF_TYPE_TEXT 
    36 ); 
    37 $freepbx_conf->define_conf_setting('MODULE_REPO', $set); 
     7// TODO: remember to put these into beta 2 migration also, most of these may not have originally been in the alpha/beta1 migration stage 
     8// 
    389 
    39 //login view 
    40 $set = array( 
    41     'value'     => 'views/login.php', 
    42     'defaultval'  => 'views/login.php', 
    43     'readonly'    => 1, 
    44     'hidden'    => 1, 
    45     'level'     => 10, 
    46     'module'    => '', 
    47     'category'    => 'Styling and Logos', 
    48     'emptyok'   => 0, 
    49     'name'      => 'View: login.php', 
    50     'description' => 'login.php view. This should never be changed except for very advanced layout changes', 
    51     'type'      => CONF_TYPE_TEXT 
    52 ); 
    53 $freepbx_conf->define_conf_setting('VIEW_LOGIN', $set); 
    54  
    55 //menu 
    56 $set = array( 
    57     'value'     => 'views/menu.php', 
    58     'defaultval'  => 'views/menu.php', 
    59     'readonly'    => 1, 
    60     'hidden'    => 1, 
    61     'level'     => 10, 
    62     'module'    => '', 
    63     'category'    => 'Styling and Logos', 
    64     'emptyok'   => 0, 
    65     'name'      => 'View: menu.php', 
    66     'description' => 'menu.php view. This should never be changed except for very advanced layout changes', 
    67     'type'      => CONF_TYPE_TEXT 
    68 ); 
    69 $freepbx_conf->define_conf_setting('VIEW_MENU', $set); 
    70  
    71 //jquery ui css 
    72 $set = array( 
    73     'value'     => 'assets/css/jquery-ui.css', 
    74     'defaultval'  => 'assets/css/jquery-ui.css', 
    75     'readonly'    => 1, 
    76     'hidden'    => 1, 
    77     'level'     => 10, 
    78     'module'    => '', 
    79     'category'    => 'Styling and Logos', 
    80     'emptyok'   => 0, 
    81     'name'      => 'jQuery UI css', 
    82     'description' => 'css file for jquery ui', 
    83     'type'      => CONF_TYPE_TEXT 
    84 ); 
    85 $freepbx_conf->define_conf_setting('JQUERY_CSS', $set); 
    86  
    87 //header 
    88 $set = array( 
    89     'value'     => 'views/header.php', 
    90     'defaultval'  => 'views/header.php', 
    91     'readonly'    => 1, 
    92     'hidden'    => 1, 
    93     'level'     => 10, 
    94     'module'    => '', 
    95     'category'    => 'Styling and Logos', 
    96     'emptyok'   => 0, 
    97     'name'      => 'View: header.php', 
    98     'description' => 'header.php view. This should never be changed except for very advanced layout changes', 
    99     'type'      => CONF_TYPE_TEXT 
    100 ); 
    101 $freepbx_conf->define_conf_setting('VIEW_HEADER', $set); 
    102  
    103 //footer 
    104 $set = array( 
    105     'value'     => 'views/footer.php', 
    106     'defaultval'  => 'views/footer.php', 
    107     'readonly'    => 1, 
    108     'hidden'    => 1, 
    109     'level'     => 10, 
    110     'module'    => '', 
    111     'category'    => 'Styling and Logos', 
    112     'emptyok'   => 0, 
    113     'name'      => 'View: freepbx.php', 
    114     'description' => 'footer.php view. This should never be changed except for very advanced layout changes', 
    115     'type'      => CONF_TYPE_TEXT 
    116 ); 
    117 $freepbx_conf->define_conf_setting('VIEW_FOOTER', $set); 
    118  
    119 //footer content 
    120 $set = array( 
    121     'value'     => 'views/footer_content.php', 
    122     'defaultval'  => 'views/footer_content.php', 
    123     'readonly'    => 1, 
    124     'hidden'    => 1, 
    125     'level'     => 10, 
    126     'module'    => '', 
    127     'category'    => 'Styling and Logos', 
    128     'emptyok'   => 0, 
    129     'name'      => 'View: footer_content.php', 
    130     'description' => 'footer_content.php view. This should never be changed except for very advanced layout changes', 
    131     'type'      => CONF_TYPE_TEXT 
    132 ); 
    133 $freepbx_conf->define_conf_setting('VIEW_FOOTER_CONTENT', $set); 
    134  
    135 //browser stats 
    136 $set = array( 
    137     'value'     => true, 
    138     'defaultval'  => true, 
    139     'readonly'    => 0, 
    140     'hidden'    => 1, 
    141     'level'     => 10, 
    142     'module'    => '', 
    143     'category'    => 'System Setup', 
    144     'emptyok'   => 0, 
    145     'name'      => 'Browser Stats', 
    146     'description' => 'Anonymous browser stat collection utiltiy for improved visuals ' 
    147             . 'and browser targeted devlopment foucus', 
    148     'type'      => CONF_TYPE_BOOL 
    149 ); 
    150 $freepbx_conf->define_conf_setting('BROWSER_STATS', $set); 
    151  
    152 //alt js 
    153 $set = array( 
    154     'value'     => '', 
    155     'defaultval'  => '', 
    156     'readonly'    => 1, 
    157     'hidden'    => 1, 
    158     'level'     => 10, 
    159     'module'    => '', 
    160     'category'    => 'Styling and Logos', 
    161     'emptyok'   => 1, 
    162     'name'      => 'Alternate JS', 
    163     'description' => 'Alternate JS file, to supplement legacy.script.js', 
    164     'type'      => CONF_TYPE_TEXT 
    165 ); 
    166 $freepbx_conf->define_conf_setting('BRAND_ALT_JS', $set); 
    167  
    168 //set some settings 
    169 $freepbx_alt_f  = $freepbx_conf->get_conf_setting('BRAND_FREEPBX_ALT_FOOT') 
    170         ? $freepbx_conf->get_conf_setting('BRAND_FREEPBX_ALT_FOOT') 
    171         : _("FreePBX&reg;"); 
    172 $freepbx_logo_f = $freepbx_conf->get_conf_setting('BRAND_IMAGE_FREEPBX_FOOT') 
    173         ? $freepbx_conf->get_conf_setting('BRAND_IMAGE_FREEPBX_FOOT')  
    174         : 'images/freepbx_small.png'; 
    175 $freepbx_link_f = $freepbx_conf->get_conf_setting('BRAND_IMAGE_FREEPBX_LINK_FOOT') 
    176         ? $freepbx_conf->get_conf_setting('BRAND_IMAGE_FREEPBX_LINK_FOOT')  
    177         : 'http://www.freepbx.org'; 
    178          
    179 $freepbx_conf->set_conf_values( 
    180       array('BRAND_IMAGE_FREEPBX_LEFT'    => 'images/tango.png'), 
    181       array('BRAND_IMAGE_FREEPBX_LINK_LEFT' => 'http://www.freepbx.org'), 
    182       array('BRAND_FREEPBX_ALT_FOOT'      => $freepbx_alt_f), 
    183       array('BRAND_IMAGE_FREEPBX_FOOT'    => $freepbx_logo_f), 
    184       array('BRAND_IMAGE_FREEPBX_LINK_FOOT' => $freepbx_link_f), 
    185       true, true); 
    186        
    187 //depreciated 
    188 //views 
     10//depricated views 
     11// 
    18912$freepbx_conf->remove_conf_settings('VIEW_FREEPBX'); 
    19013$freepbx_conf->remove_conf_settings('VIEW_FREEPBX_ADMIN'); 
     
    20225$freepbx_conf->remove_conf_settings('VIEW_REPORTS'); 
    20326$freepbx_conf->remove_conf_settings('VIEW_PANEL'); 
     27$freepbx_conf->remove_conf_settings('BRAND_IMAGE_FREEPBX_LEFT'); 
    20428 
    20529//commit all settings 
    20630$freepbx_conf->commit_conf_settings(); 
     31 
    20732//settings 
    20833global $amp_conf;