Changeset 2419 for trunk/admin
- Timestamp:
- 04/05/10 16:31:25 (14 years ago)
- Location:
- trunk/admin
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/inc/class.uiaccess_history.inc.php
r2 r2419 51 51 } 52 52 $GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin'); 53 $GLOBALS['phpgw']->common->phpgw_header();54 echo parse_navbar();53 //$GLOBALS['phpgw']->common->phpgw_header(); 54 //echo parse_navbar(); 55 55 56 56 $total_records = $this->bo->total($account_id); -
trunk/admin/inc/class.uiapplications.inc.php
r2 r2419 46 46 } 47 47 $GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin'); 48 $GLOBALS['phpgw']->common->phpgw_header();49 echo parse_navbar();48 //$GLOBALS['phpgw']->common->phpgw_header(); 49 //echo parse_navbar(); 50 50 51 51 $GLOBALS['phpgw']->template->set_file(array('applications' => 'applications.tpl')); … … 225 225 } 226 226 $GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin'); 227 $GLOBALS['phpgw']->common->phpgw_header();228 echo parse_navbar();227 //$GLOBALS['phpgw']->common->phpgw_header(); 228 //echo parse_navbar(); 229 229 230 230 $GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']); … … 307 307 } 308 308 $GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin'); 309 $GLOBALS['phpgw']->common->phpgw_header();310 echo parse_navbar();309 //$GLOBALS['phpgw']->common->phpgw_header(); 310 //echo parse_navbar(); 311 311 312 312 if ($totalerrors) … … 369 369 } 370 370 $GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin'); 371 $GLOBALS['phpgw']->common->phpgw_header();372 echo parse_navbar();371 //$GLOBALS['phpgw']->common->phpgw_header(); 372 //echo parse_navbar(); 373 373 374 374 $GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to delete the application %1 ?',$GLOBALS['phpgw_info']['apps'][$app_name]['title'])); -
trunk/admin/inc/class.uiasyncservice.inc.php
r86 r2419 47 47 } 48 48 $GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin'); 49 $GLOBALS['phpgw']->common->phpgw_header();50 echo parse_navbar();49 //$GLOBALS['phpgw']->common->phpgw_header(); 50 //echo parse_navbar(); 51 51 52 52 $async = $GLOBALS['phpgw']->asyncservice; // use an own instance, as we might set debug=True -
trunk/admin/inc/class.uicategories.inc.php
r662 r2419 178 178 179 179 $GLOBALS['phpgw_info']['flags']['app_header'] .= ' - '.lang('Global categories'); 180 $GLOBALS['phpgw']->common->phpgw_header();181 echo parse_navbar();180 //$GLOBALS['phpgw']->common->phpgw_header(); 181 //echo parse_navbar(); 182 182 $this->set_langs(); 183 183 … … 542 542 $this->template->set_var('hidden_vars',$hidden_vars); 543 543 544 $GLOBALS['phpgw']->common->phpgw_header();545 echo parse_navbar();544 //$GLOBALS['phpgw']->common->phpgw_header(); 545 //echo parse_navbar(); 546 546 547 547 $this->template->pfp('out','form'); … … 601 601 } 602 602 $GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin'); 603 $GLOBALS['phpgw']->common->phpgw_header();604 echo parse_navbar();603 //$GLOBALS['phpgw']->common->phpgw_header(); 604 //echo parse_navbar(); 605 605 606 606 $hidden_vars = '<input type="hidden" name="cat_id" value="' . $this->cat_id . '">' . "\n"; -
trunk/admin/inc/class.uiconfig.inc.php
r1325 r2419 149 149 $GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin'); 150 150 151 $GLOBALS['phpgw']->common->phpgw_header();152 echo parse_navbar();151 //$GLOBALS['phpgw']->common->phpgw_header(); 152 //echo parse_navbar(); 153 153 154 154 if($appname=="expressoAdmin1_2") { … … 189 189 include_once("news_admin/inc/fckeditor.php"); 190 190 $oFCKeditor = new FCKeditor('newsettings[agree_term]');//CreateObject('news_admin.fckeditor','newsettings[agree_term]'); 191 $oFCKeditor->BasePath = 'news_admin/templates/default/fckeditor/'; 191 192 $webserver_url = $GLOBALS['phpgw_info']['server']['webserver_url']; 193 $webserver_url = ( !empty($webserver_url) ) ? $webserver_url : '/'; 194 195 if(strrpos($webserver_url,'/') === false || strrpos($webserver_url,'/') != (strlen($webserver_url)-1)) 196 $webserver_url .= '/'; 197 198 $oFCKeditor->BasePath = $webserver_url . 'news_admin/templates/default/fckeditor/'; 192 199 $oFCKeditor->ToolbarSet = 'Basic'; 193 200 $oFCKeditor->Value = isset($GLOBALS['phpgw_info']['server']['agree_term']) ? $GLOBALS['phpgw_info']['server']['agree_term'] : ''; -
trunk/admin/inc/class.uicurrentsessions.inc.php
r2 r2419 39 39 } 40 40 $GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin'); 41 $GLOBALS['phpgw']->common->phpgw_header();42 echo parse_navbar();41 //$GLOBALS['phpgw']->common->phpgw_header(); 42 //echo parse_navbar(); 43 43 } 44 44 -
trunk/admin/inc/class.uilog.inc.php
r2 r2419 266 266 } 267 267 $GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin'); 268 $GLOBALS['phpgw']->common->phpgw_header();269 echo parse_navbar();268 //$GLOBALS['phpgw']->common->phpgw_header(); 269 //echo parse_navbar(); 270 270 $this->t->pfp('out','log_list_t'); 271 271 // $this->set_app_langs(); -
trunk/admin/inc/class.uimainscreen.inc.php
r1362 r2419 93 93 94 94 $GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin'); 95 $GLOBALS['phpgw']->common->phpgw_header();96 echo parse_navbar();95 //$GLOBALS['phpgw']->common->phpgw_header(); 96 //echo parse_navbar(); 97 97 98 98 … … 161 161 162 162 $GLOBALS['phpgw']->js->validate_file('jscode','openwindow','admin'); 163 $GLOBALS['phpgw']->common->phpgw_header();164 echo parse_navbar();163 //$GLOBALS['phpgw']->common->phpgw_header(); 164 //echo parse_navbar(); 165 165 166 166 $GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uimainscreen.index')); -
trunk/admin/inc/class.uivoip.inc.php
r571 r2419 57 57 $GLOBALS['phpgw']->js->validate_file('voip',$tmp,'admin'); 58 58 59 $GLOBALS['phpgw']->common->phpgw_header();60 echo parse_navbar();59 //$GLOBALS['phpgw']->common->phpgw_header(); 60 //echo parse_navbar(); 61 61 echo '<script type="text/javascript">var path_adm="'.$webserver_url .'"</script>'; 62 echo $GLOBALS['phpgw']->js->get_script_links(); 62 63 63 64 $ous = "<option value='-1'>-- ".lang('Select Organization')." --</option>"; -
trunk/admin/phpinfo.php
r2 r2419 23 23 } 24 24 25 // Throw a little notice out if PHPaccelerator is enabled. 25 ob_start(); 26 27 phpinfo(); 28 29 $matches = array (); 30 preg_match( '%(<style type="text/css">.*?</style>).*?<body>(.*?)</body>%s', ob_get_clean( ), $matches ); 31 32 $matches[ 1 ] = preg_replace( '%body.*?{[^}]*}\n%s', '', $matches[ 1 ] ); 33 $matches[ 1 ] = preg_replace( '%(\n)%s', '$1.phpinfo ', $matches[ 1 ] ); 34 35 phpcredits( CREDITS_ALL - CREDITS_FULLPAGE ); 36 37 $matches[ 2 ] = preg_replace( '%<a[^>]*>PHP Credits</a>%s', ob_get_clean( ), $matches[ 2 ] ); 38 39 // Throw a little notice out if PHPaccelerator is enabled. 26 40 if($GLOBALS['_PHPA']['ENABLED']) 27 41 { … … 30 44 } 31 45 32 phpinfo(); 33 // $phpgw->common->phpgw_footer(); 46 print $matches[ 1 ] . '<div class="phpinfo">' . $matches[ 2 ] . '</div>'; 34 47 ?> -
trunk/admin/templates/default/listcats.tpl
r577 r2419 56 56 57 57 <tr valign="bottom" height="50"> 58 <form method="POST" action="{action_url}"> 59 <!-- BEGIN add --> 60 <td><input type="submit" name="add" value="{lang_add}"> 61 <!-- END add --> 62 <input type="submit" name="done" value="{lang_cancel}"></td> 58 <td> 59 <form method="POST" action="{action_url}"> 60 <input type="submit" name="add" value="{lang_add}"> 61 <input type="submit" name="done" value="{lang_cancel}"> 62 </form> 63 </td> 63 64 <td colspan="5"> </td> 64 </form>65 65 </tr> 66 66 </table>
Note: See TracChangeset
for help on using the changeset viewer.