Changeset 11459

Show
Ignore:
Timestamp:
02/19/11 01:25:14 (2 years ago)
Author:
p_lindheimer
Message:

make views into freepbx_settings hidden/readonly settings so a module could change replacing with new views

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.9/amp_conf/htdocs/admin/config.php

    r11458 r11459  
    7171 
    7272  if (!$refererok) { 
    73     show_view('views/bad_refferer.php'); 
     73    show_view($amp_conf['VIEW_BAD_REFFERER'], array('amp_conf'=>&$amp_conf)); 
    7474    exit; 
    7575  } 
    …… 
    177177// check access 
    178178if (!is_array($cur_menuitem) && $display != "") { 
    179   show_view("views/noaccess.php"); 
     179  show_view($amp_conf['VIEW_NOACCESS'], array('amp_conf'=>&$amp_conf)); 
    180180  exit; 
    181181} 
    …… 
    257257    // include the module page 
    258258    if (isset($cur_menuitem['disabled']) && $cur_menuitem['disabled']) { 
    259       show_view("views/menuitem_disabled.php",$cur_menuitem); 
     259      show_view($amp_conf['VIEW_MENUITEM_DISABLED'],$cur_menuitem); 
    260260      break; // we break here to avoid the generateconfigpage() below 
    261261    } else if (file_exists($module_file)) { 
    …… 
    289289  case '': 
    290290    if ($astman) { 
    291       show_view('views/welcome.php', array('AMP_CONF' => &$amp_conf)); 
     291      show_view($amp_conf['VIEW_WELCOME'], array('AMP_CONF' => &$amp_conf)); 
    292292    } else { 
    293293      // no manager, no connection to asterisk 
    294       show_view('views/welcome_nomanager.php', array('mgruser' => $amp_conf["AMPMGRUSER"])); 
     294      show_view($amp_conf['VIEW_WELCOME_NOMANAGER'], array('mgruser' => $amp_conf["AMPMGRUSER"])); 
    295295    } 
    296296  break; 
    …… 
    315315 
    316316  // then load it and put it into the main freepbx interface 
    317   $template['content'] = load_view('views/freepbx_admin.php', $admin_template) . load_view('views/freepbx_footer.php',$admin_tempalate) ; 
     317  $template['content'] = load_view($amp_conf['VIEW_FREEPBX_ADMIN'], $admin_template) . load_view('views/freepbx_footer.php',$admin_tempalate) ; 
    318318  $template['use_nav_background'] = true; 
    319319 
    …… 
    346346  $template['benchmark_starttime'] = $benchmark_starttime; 
    347347 
    348   show_view('views/freepbx.php', $template); 
     348  show_view($amp_conf['VIEW_FREEPBX'], $template); 
    349349} 
    350350 

  • freepbx/branches/2.9/amp_conf/htdocs/admin/libraries/gui_auth.php

    r11458 r11459  
    99  $_SESSION['logout'] = true;  
    1010 
    11   show_view('views/loggedout.php'); 
     11  show_view($amp_conf['VIEW_LOGGEDOUT'], array('amp_conf'=>&$amp_conf)); 
    1212  exit; 
    1313} 
    …… 
    3737      @header('WWW-Authenticate: Basic realm="'._('FreePBX Administration').'"'); 
    3838      @header('HTTP/1.0 401 Unauthorized'); 
    39       show_view("views/unauthorized.php"); 
     39      show_view($amp_conf['VIEW_UNAUTHORIZED'], array('amp_conf'=>&$amp_conf)); 
    4040      exit; 
    4141    } 
    …… 
    8080      @header('WWW-Authenticate: Basic realm=" '._('FreePBX Administration').'"'); 
    8181      @header('HTTP/1.0 401 Unauthorized'); 
    82       show_view("views/unauthorized.php"); 
     82      show_view($amp_conf['VIEW_UNAUTHORIZED'], array('amp_conf'=>&$amp_conf)); 
    8383      exit; 
    8484    } 

  • freepbx/branches/2.9/amp_conf/htdocs/admin/panel.php

    r11458 r11459  
    2323$message=_("Flash Operator Panel"); 
    2424 
    25 $template['amp_conf'] = &$amp_conf; 
    26  
    27 show_view('views/panel.php', array('title'=>$title, 'deptname' => $_SESSION["AMP_user"]->_deptname, 'amp_conf' => &$amp_conf)); 
     25show_view($amp_conf['VIEW_PANEL'], array('title'=>$title, 'deptname' => $_SESSION["AMP_user"]->_deptname, 'amp_conf' => &$amp_conf)); 
    2826?> 

  • freepbx/branches/2.9/amp_conf/htdocs/admin/reports.php

    r11458 r11459  
    4848} 
    4949 
    50 show_view('views/reports.php', array('amp_conf'=>&$amp_conf, 'title'=>$title, 'display'=>$display, 'menu' => $menu)); 
     50show_view($amp_conf['VIEW_REPORTS'], array('amp_conf'=>&$amp_conf, 'title'=>$title, 'display'=>$display, 'menu' => $menu)); 
    5151?> 
    5252</div> 

  • freepbx/branches/2.9/amp_conf/htdocs/admin/views/bad_refferer.php

    r11458 r11459  
    1919  "<p>"._("SUSPECT LINK:")." &nbsp;<b><a href='".$_SERVER['REQUEST_URI']."'>"."$rtype://".$_SERVER['SERVER_NAME'].$_SERVER['REQUEST_URI'].$port."</a></b>"."</p>\n". 
    2020  "</div>\n"; 
    21 show_view('views/freepbx.php', $template); 
     21show_view($amp_conf['VIEW_FREEPBX'], $template); 
    2222 
    2323?> 

  • freepbx/branches/2.9/amp_conf/htdocs/admin/views/freepbx.php

    r11458 r11459  
    277277 
    278278if ($reload_needed) { 
    279   show_view('views/freepbx_reload.php'); 
     279  show_view($amp_conf['VIEW_FREEPBX_RELOAD']); 
    280280} 
    281281?> 
    …… 
    327327  // need reload bar - hidden by default 
    328328  if ($reload_needed) { 
    329     show_view('views/freepbx_reloadbar.php'); 
     329    show_view($amp_conf['VIEW_FREEPBX_RELOADBAR']); 
    330330  } 
    331331   

  • freepbx/branches/2.9/amp_conf/htdocs/admin/views/loggedout.php

    r11458 r11459  
    1212  "<a href=\"".$_SERVER['PHP_SELF']."\">"._("Log in")."</a></span></p>\n"; 
    1313} 
    14 show_view('views/freepbx.php', $template); 
     14show_view($amp_conf['VIEW_FREEPBX'], $template); 
    1515 
    1616?> 

  • freepbx/branches/2.9/amp_conf/htdocs/admin/views/noaccess.php

    r11458 r11459  
    44  "<h2>"._("Not found")."</h2>". 
    55  "<p>"._("The section you requested does not exist or you do not have access to it.")."</p>"; 
    6 show_view('views/freepbx.php', $template); 
     6show_view($amp_conf['VIEW_FREEPBX'], $template); 
    77 
    88?> 

  • freepbx/branches/2.9/amp_conf/htdocs/admin/views/panel.php

    r11458 r11459  
    77  '<iframe width="97%" height="600" frameborder="0" align="top" src="../panel/index_amp.php?context='.$deptname.'"></iframe>'. 
    88  '</div>'; 
    9 show_view('views/freepbx.php', $template); 
     9show_view($amp_conf['VIEW_FREEPBX'], $template); 
    1010 
    1111?> 

  • freepbx/branches/2.9/amp_conf/htdocs/admin/views/reports.php

    r11458 r11459  
    1717  '</div>'; 
    1818 
    19 show_view('views/freepbx.php', $template); 
     19show_view($amp_conf['VIEW_FREEPBX'], $template); 
    2020 
    2121?> 

  • freepbx/branches/2.9/amp_conf/htdocs/admin/views/unauthorized.php

    r11458 r11459  
    44  "<h2>"._("Unauthorized")."</h2>". 
    55  "<p>"._("You are not authorized to access this page.")."</p>"; 
    6 show_view('views/freepbx.php', $template); 
     6show_view($amp_conf['VIEW_FREEPBX'], $template); 
    77 
    88?> 

  • freepbx/branches/2.9/libfreepbx.install.php

    r11456 r11459  
    15131513  $set['description'] = 'Legacy setting, use BRAND_IMAGE_FREEPBX_RIGHT in the future. If set, this will override BRAND_IMAGE_FREEPBX_RIGHT. The setting is the name of the image file and is always assumed to be present in the admin/images directory. Overrides the standard logo that is to be displayed at the TOP RIGHT of the admin screen. This enables you to customize the look of the administration screen. NOTE: images need to be saved in the ..../admin/images directory of your AMP install. This image should be 55px in height.'; 
    15141514  $set['readonly'] = 1; 
     1515  $set['sortorder'] = 0; 
    15151516  $set['type'] = CONF_TYPE_TEXT; 
    15161517  $set['emptyok'] = 1; 
    …… 
    15231524  $set['description'] = 'Hide the configured left navigation bar background.'; 
    15241525  $set['readonly'] = 0; 
     1526  $set['sortorder'] = 10; 
    15251527  $set['type'] = CONF_TYPE_BOOL; 
    15261528  $set['emptyok'] = 0; 
    …… 
    15341536  $set['emptyok'] = 1; 
    15351537  $set['readonly'] = 1; 
     1538  $set['sortorder'] = 20; 
    15361539  $set['type'] = CONF_TYPE_TEXT; 
    15371540  $freepbx_conf->define_conf_setting('BRAND_IMAGE_SHADOW_SIDE_BACKGROUND',$set); 
    …… 
    15431546  $set['description'] = 'Right upper logo. Use this setting instead of AMPADMINLOGO. Path is relative to admin.'; 
    15441547  $set['readonly'] = 1; 
     1548  $set['sortorder'] = 30; 
    15451549  $set['type'] = CONF_TYPE_TEXT; 
    15461550  $set['emptyok'] = 0; 
    …… 
    15531557  $set['description'] = 'Left upper logo.  Path is relative to admin.'; 
    15541558  $set['readonly'] = 1; 
     1559  $set['sortorder'] = 40; 
    15551560  $set['type'] = CONF_TYPE_TEXT; 
    15561561  $set['emptyok'] = 0; 
    …… 
    15631568  $set['description'] = 'Logo in footer.  Path is relative to admin.'; 
    15641569  $set['readonly'] = 1; 
     1570  $set['sortorder'] = 50; 
    15651571  $set['type'] = CONF_TYPE_TEXT; 
    15661572  $set['emptyok'] = 1; 
    …… 
    15731579  $set['description'] = 'Image used during a reload, default is animated GIF eating the * (asterisk).  Path is relative to admin.'; 
    15741580  $set['readonly'] = 1; 
     1581  $set['sortorder'] = 60; 
    15751582  $set['type'] = CONF_TYPE_TEXT; 
    15761583  $set['emptyok'] = 1; 
    …… 
    15831590  $set['description'] = 'alt attribute to use in place of image and title hover value. Defaults to FreePBX'; 
    15841591  $set['readonly'] = 1; 
     1592  $set['sortorder'] = 70; 
    15851593  $set['type'] = CONF_TYPE_TEXT; 
    15861594  $set['emptyok'] = 1; 
    …… 
    15931601  $set['description'] = 'alt attribute to use in place of image and title hover value. Defaults to FreePBX'; 
    15941602  $set['readonly'] = 1; 
     1603  $set['sortorder'] = 80; 
    15951604  $set['type'] = CONF_TYPE_TEXT; 
    15961605  $set['emptyok'] = 1; 
    …… 
    16031612  $set['description'] = 'alt attribute to use in place of image and title hover value. Defaults to FreePBX'; 
    16041613  $set['readonly'] = 1; 
     1614  $set['sortorder'] = 90; 
    16051615  $set['type'] = CONF_TYPE_TEXT; 
    16061616  $set['emptyok'] = 1; 
    …… 
    16131623  $set['description'] = 'link to follow when clicking on logo, defaults to http://www.freepbx.org'; 
    16141624  $set['readonly'] = 1; 
     1625  $set['sortorder'] = 100; 
    16151626  $set['type'] = CONF_TYPE_TEXT; 
    16161627  $set['emptyok'] = 1; 
    …… 
    16231634  $set['description'] = 'link to follow when clicking on logo, defaults to http://www.freepbx.org'; 
    16241635  $set['readonly'] = 1; 
     1636  $set['sortorder'] = 110; 
    16251637  $set['type'] = CONF_TYPE_TEXT; 
    16261638  $set['emptyok'] = 1; 
    …… 
    16331645  $set['description'] = 'link to follow when clicking on logo, defaults to http://www.freepbx.org'; 
    16341646  $set['readonly'] = 1; 
     1647  $set['sortorder'] = 120; 
    16351648  $set['type'] = CONF_TYPE_TEXT; 
    16361649  $set['emptyok'] = 1; 
    …… 
    16431656  $set['description'] = 'Setting to true will hide the upper right logo.'; 
    16441657  $set['readonly'] = 0; 
     1658  $set['sortorder'] = 130; 
    16451659  $set['type'] = CONF_TYPE_BOOL; 
    16461660  $set['emptyok'] = 0; 
    …… 
    16531667  $set['description'] = 'Setting to true will hide the FreePBX version information below the left upper header.'; 
    16541668  $set['readonly'] = 0; 
     1669  $set['sortorder'] = 140; 
    16551670  $set['type'] = CONF_TYPE_BOOL; 
    16561671  $set['emptyok'] = 0; 
    …… 
    16631678  $set['description'] = 'Setting to true will hide the complete horizontal menu bar in the header.'; 
    16641679  $set['readonly'] = 0; 
     1680  $set['sortorder'] = 150; 
    16651681  $set['type'] = CONF_TYPE_BOOL; 
    16661682  $set['emptyok'] = 0; 
    …… 
    16731689  $set['description'] = 'Set this to replace the default mainstyle.css style sheet with your own, relative to admin.'; 
    16741690  $set['readonly'] = 1; 
     1691  $set['sortorder'] = 160; 
    16751692  $set['type'] = CONF_TYPE_TEXT; 
    16761693  $set['emptyok'] = 1; 
    …… 
    16831700  $set['description'] = 'Optional custom CSS style sheet included after the primary one and any module specific ones are loaded, relative to admin.'; 
    16841701  $set['readonly'] = 1; 
     1702  $set['sortorder'] = 170; 
    16851703  $set['type'] = CONF_TYPE_TEXT; 
    16861704  $set['emptyok'] = 1; 
    16871705  $freepbx_conf->define_conf_setting('BRAND_CSS_CUSTOM',$set); 
     1706 
     1707  // VIEW_FREEPBX_ADMIN 
     1708  $set['value'] = 'views/freepbx_admin.php'; 
     1709  $set['options'] = ''; 
     1710  $set['name'] = 'View: freepbx_admin.php'; 
     1711  $set['description'] = 'freepbx_admin.php view. This should never be changed except for very advanced layout changes.'; 
     1712  $set['readonly'] = 1; 
     1713  $set['emptyok'] = 0; 
     1714  $set['hidden'] = 1; 
     1715  $set['sortorder'] = 180; 
     1716  $set['type'] = CONF_TYPE_TEXT; 
     1717  $freepbx_conf->define_conf_setting('VIEW_FREEPBX_ADMIN',$set); 
     1718 
     1719  // VIEW_FREEPBX 
     1720  $set['value'] = 'views/freepbx.php'; 
     1721  $set['options'] = ''; 
     1722  $set['name'] = 'View: freepbx.php'; 
     1723  $set['description'] = 'freepbx.php view. This should never be changed except for very advanced layout changes.'; 
     1724  $set['readonly'] = 1; 
     1725  $set['emptyok'] = 0; 
     1726  $set['hidden'] = 1; 
     1727  $set['sortorder'] = 190; 
     1728  $set['type'] = CONF_TYPE_TEXT; 
     1729  $freepbx_conf->define_conf_setting('VIEW_FREEPBX',$set); 
     1730 
     1731  // VIEW_FREEPBX_RELOAD 
     1732  $set['value'] = 'views/freepbx_reload.php'; 
     1733  $set['options'] = ''; 
     1734  $set['name'] = 'View: freepbx_reload.php'; 
     1735  $set['description'] = 'freepbx_reload.php view. This should never be changed except for very advanced layout changes.'; 
     1736  $set['readonly'] = 1; 
     1737  $set['emptyok'] = 0; 
     1738  $set['hidden'] = 1; 
     1739  $set['sortorder'] = 200; 
     1740  $set['type'] = CONF_TYPE_TEXT; 
     1741  $freepbx_conf->define_conf_setting('VIEW_FREEPBX_RELOAD',$set); 
     1742 
     1743  // VIEW_FREEPBX_RELOADBAR 
     1744  $set['value'] = 'views/freepbx_reloadbar.php'; 
     1745  $set['options'] = ''; 
     1746  $set['name'] = 'View: freepbx_reloadbar.php'; 
     1747  $set['description'] = 'freepbx_reloadbar.php view. This should never be changed except for very advanced layout changes.'; 
     1748  $set['readonly'] = 1; 
     1749  $set['emptyok'] = 0; 
     1750  $set['hidden'] = 1; 
     1751  $set['sortorder'] = 210; 
     1752  $set['type'] = CONF_TYPE_TEXT; 
     1753  $freepbx_conf->define_conf_setting('VIEW_FREEPBX_RELOADBAR',$set); 
     1754 
     1755  // VIEW_WELCOME 
     1756  $set['value'] = 'views/welcome.php'; 
     1757  $set['options'] = ''; 
     1758  $set['name'] = 'View: welcome.php'; 
     1759  $set['description'] = 'welcome.php view. This should never be changed except for very advanced layout changes.'; 
     1760  $set['readonly'] = 1; 
     1761  $set['emptyok'] = 0; 
     1762  $set['hidden'] = 1; 
     1763  $set['sortorder'] = 220; 
     1764  $set['type'] = CONF_TYPE_TEXT; 
     1765  $freepbx_conf->define_conf_setting('VIEW_WELCOME',$set); 
     1766 
     1767  // VIEW_WELCOME_NONMANAGER 
     1768  $set['value'] = 'views/welcome_nomanager.php'; 
     1769  $set['options'] = ''; 
     1770  $set['name'] = 'View: welcome_nomanager.php'; 
     1771  $set['description'] = 'welcome_nomanager.php view. This should never be changed except for very advanced layout changes.'; 
     1772  $set['readonly'] = 1; 
     1773  $set['emptyok'] = 0; 
     1774  $set['hidden'] = 1; 
     1775  $set['sortorder'] = 230; 
     1776  $set['type'] = CONF_TYPE_TEXT; 
     1777  $freepbx_conf->define_conf_setting('VIEW_WELCOME_NONMANAGER',$set); 
     1778 
     1779  // VIEW_MENUITEM_DISABLED 
     1780  $set['value'] = 'views/menuitem_disabled.php'; 
     1781  $set['options'] = ''; 
     1782  $set['name'] = 'View: menuitem_disabled.php'; 
     1783  $set['description'] = 'menuitem_disabled.php view. This should never be changed except for very advanced layout changes.'; 
     1784  $set['readonly'] = 1; 
     1785  $set['emptyok'] = 0; 
     1786  $set['hidden'] = 1; 
     1787  $set['sortorder'] = 240; 
     1788  $set['type'] = CONF_TYPE_TEXT; 
     1789  $freepbx_conf->define_conf_setting('VIEW_MENUITEM_DISABLED',$set); 
     1790 
     1791  // VIEW_NOACCESS 
     1792  $set['value'] = 'views/noaccess.php'; 
     1793  $set['options'] = ''; 
     1794  $set['name'] = 'View: noaccess.php'; 
     1795  $set['description'] = 'noaccess.php view. This should never be changed except for very advanced layout changes.'; 
     1796  $set['readonly'] = 1; 
     1797  $set['emptyok'] = 0; 
     1798  $set['hidden'] = 1; 
     1799  $set['sortorder'] = 250; 
     1800  $set['type'] = CONF_TYPE_TEXT; 
     1801  $freepbx_conf->define_conf_setting('VIEW_NOACCESS',$set); 
     1802 
     1803  // VIEW_UNAUTHORIZED 
     1804  $set['value'] = 'views/unauthorized.php'; 
     1805  $set['options'] = ''; 
     1806  $set['name'] = 'View: unauthorized.php'; 
     1807  $set['description'] = 'unauthorized.php view. This should never be changed except for very advanced layout changes.'; 
     1808  $set['readonly'] = 1; 
     1809  $set['emptyok'] = 0; 
     1810  $set['hidden'] = 1; 
     1811  $set['sortorder'] = 260; 
     1812  $set['type'] = CONF_TYPE_TEXT; 
     1813  $freepbx_conf->define_conf_setting('VIEW_UNAUTHORIZED',$set); 
     1814 
     1815  // VIEW_BAD_REFFERER 
     1816  $set['value'] = 'views/bad_refferer.php'; 
     1817  $set['options'] = ''; 
     1818  $set['name'] = 'View: bad_refferer.php'; 
     1819  $set['description'] = 'bad_refferer.php view. This should never be changed except for very advanced layout changes.'; 
     1820  $set['readonly'] = 1; 
     1821  $set['emptyok'] = 0; 
     1822  $set['hidden'] = 1; 
     1823  $set['sortorder'] = 270; 
     1824  $set['type'] = CONF_TYPE_TEXT; 
     1825  $freepbx_conf->define_conf_setting('VIEW_BAD_REFFERER',$set); 
     1826 
     1827  // VIEW_LOGGEDOUT 
     1828  $set['value'] = 'views/loggedout.php'; 
     1829  $set['options'] = ''; 
     1830  $set['name'] = 'View: loggedout.php'; 
     1831  $set['description'] = 'loggedout.php view. This should never be changed except for very advanced layout changes.'; 
     1832  $set['readonly'] = 1; 
     1833  $set['emptyok'] = 0; 
     1834  $set['hidden'] = 1; 
     1835  $set['sortorder'] = 280; 
     1836  $set['type'] = CONF_TYPE_TEXT; 
     1837  $freepbx_conf->define_conf_setting('VIEW_LOGGEDOUT',$set); 
     1838 
     1839  // VIEW_PANEL 
     1840  $set['value'] = 'views/panel.php'; 
     1841  $set['options'] = ''; 
     1842  $set['name'] = 'View: panel.php'; 
     1843  $set['description'] = 'panel.php view. This should never be changed except for very advanced layout changes.'; 
     1844  $set['readonly'] = 1; 
     1845  $set['emptyok'] = 0; 
     1846  $set['hidden'] = 1; 
     1847  $set['sortorder'] = 290; 
     1848  $set['type'] = CONF_TYPE_TEXT; 
     1849  $freepbx_conf->define_conf_setting('VIEW_PANEL',$set); 
     1850 
     1851  // VIEW_REPORTS 
     1852  $set['value'] = 'views/reports.php'; 
     1853  $set['options'] = ''; 
     1854  $set['name'] = 'View: reports.php'; 
     1855  $set['description'] = 'reports.php view. This should never be changed except for very advanced layout changes.'; 
     1856  $set['readonly'] = 1; 
     1857  $set['emptyok'] = 0; 
     1858  $set['hidden'] = 1; 
     1859  $set['sortorder'] = 300; 
     1860  $set['type'] = CONF_TYPE_TEXT; 
     1861  $freepbx_conf->define_conf_setting('VIEW_REPORTS',$set); 
     1862 
    16881863 
    16891864  //