Changeset 2549
- Timestamp:
- 04/15/10 15:26:02 (14 years ago)
- Location:
- trunk
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/class.uicalendar.inc.php
r2496 r2549 3090 3090 } 3091 3091 3092 include ($file);3092 include_once($file); 3093 3093 $refer = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']); 3094 3094 if($refer[2] != 'view') { … … 4916 4916 if ($param['plain'] != "True"){ 4917 4917 // $GLOBALS['phpgw']->common->phpgw_header(); 4918 echo $GLOBALS['phpgw']->common->get_java_script( );4919 4918 } 4920 4919 else{ -
trunk/calendar/inc/hook_home.inc.php
r234 r2549 14 14 $phpgw_flags = Array( 15 15 'currentapp' => 'calendar', 16 'noheader' => True,17 'nonavbar' => True,16 //'noheader' => True, 17 //'nonavbar' => True, 18 18 'noappheader' => True, 19 19 'noappfooter' => True, -
trunk/calendar/js/edit_exmail.js
r2008 r2549 226 226 return; 227 227 } 228 228 229 scriptPath = URL_SERVER + '/' + scriptPath; 230 229 231 expresso.connector.oxmlhttp.open("GET", scriptPath, false); 230 232 expresso.connector.oxmlhttp.setRequestHeader('Content-Type','text/plain'); … … 245 247 Element('tbl_ext_participants').style.display=''; 246 248 el.style.display='none'; 247 loadScript(path+"/js/ DropDownContacts.js");248 loadScript(path+"/js/ common_functions.js");249 loadScript(path+"/js/ QuickCatalogSearch.js");249 loadScript(path+"/js/jscode/DropDownContacts.js"); 250 loadScript(path+"/js/jscode/common_functions.js"); 251 loadScript(path+"/js/jscode/QuickCatalogSearch.js"); 250 252 loadScript("calendar/js/over_fn_exmail.js"); 251 253 if(!contacts) -
trunk/contactcenter/inc/class.ui_data.inc.php
r2475 r2549 265 265 $main .= $GLOBALS['phpgw']->template->get_var('out'); 266 266 267 echo $GLOBALS['phpgw']->common->get_java_script( );268 267 echo $main; 269 268 } -
trunk/expressoAdmin1_2/inc/class.institutional_accounts.inc.php
r2459 r2549 99 99 $p->set_var($var); 100 100 $p->pfp('out','body'); 101 echo "<script>var expressoAdmin_url = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/' )}';var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( );101 $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = "<script>var expressoAdmin_url = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/' )}';var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>"; 102 102 } 103 103 -
trunk/expressoAdmin1_2/inc/class.uiaccounts.inc.php
r2459 r2549 51 51 $GLOBALS['phpgw']->js->validate_file('jscode','tabs','expressoAdmin1_2'); 52 52 $GLOBALS['phpgw']->js->validate_file('jscode','users','expressoAdmin1_2'); 53 $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>"; 53 54 } 54 55 … … 724 725 $t->set_var('display_samba_suport', 'none'); 725 726 726 echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( );727 727 echo "<style>{$this -> css( )}</style>"; 728 728 $t->pfp('out','body'); 729 echo'<script>get_available_groups(document.forms[0].context.value);get_available_maillists(document.forms[0].context.value);use_samba_attrs("'.$user_info['sambaUser'].'");</script>';729 $GLOBALS['phpgw_info']['flags']['java_script'] = '<script>get_available_groups(document.forms[0].context.value);get_available_maillists(document.forms[0].context.value);use_samba_attrs("'.$user_info['sambaUser'].'");</script>'; 730 730 } 731 731 -
trunk/expressoAdmin1_2/inc/class.uigroups.inc.php
r2476 r2549 45 45 $GLOBALS['phpgw']->js->validate_file('jscode','expressoadmin','expressoAdmin1_2'); 46 46 $GLOBALS['phpgw']->js->validate_file('jscode','groups','expressoAdmin1_2'); 47 $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>"; 47 48 } 48 49 … … 162 163 $p->set_var('input_search',lang('Search') . ' <input name="query" value="'.htmlspecialchars(stripslashes($GLOBALS['query'])).'">'); 163 164 } 164 echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( );165 165 $p->pfp('out','list'); 166 166 } … … 242 242 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 243 243 244 echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( );245 244 $p->pfp('out','create_group'); 246 245 echo '<script>get_available_users(document.forms[0].org_context.value, document.forms[0].ea_check_allUsers.checked);</script>'; … … 362 361 $p->set_var($var); 363 362 $p->set_var($this->functions->make_dinamic_lang($p, 'list')); 364 echo "<script>var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( );365 363 $p->pfp('out','create_group'); 366 echo'<script>get_available_users(document.forms[0].org_context.value, document.forms[0].ea_check_allUsers.checked);</script>';364 $GLOBALS['phpgw_info']['flags']['java_script'] = '<script>get_available_users(document.forms[0].org_context.value, document.forms[0].ea_check_allUsers.checked);</script>'; 367 365 } 368 366 -
trunk/expressoAdmin1_2/inc/class.uishared_accounts.inc.php
r2469 r2549 111 111 ); 112 112 $p->set_var($var); 113 echo "<script>var expressoAdmin_url = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/' )}';var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>" . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( );113 $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = "<script>var expressoAdmin_url = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/' )}';var expressoAdmin_controller = '{$GLOBALS[ 'phpgw' ] -> link( '/expressoAdmin1_2/controller.php' )}?action=';</script>"; 114 114 $p->pfp('out','body'); 115 115 } -
trunk/expressoMail1_2/inc/load_lang.php
r2517 r2549 1 1 <?php 2 2 3 /*************************************************************************** 4 * Expresso Livre * 5 * http://www.expressolivre.org * 6 * -------------------------------------------- * 7 * This program is free software; you can redistribute it and/or modify it * 8 * under the terms of the GNU General Public License as published by the * 9 * Free Software Foundation; either version 2 of the License, or (at your * 10 * option) any later version. * 11 \**************************************************************************/ 3 /**************************************************************************\ 4 * Expresso Livre * 5 * http://www.expressolivre.org * 6 * -------------------------------------------- * 7 * This program is free software; you can redistribute it and/or modify it * 8 * under the terms of the GNU General Public License as published by the * 9 * Free Software Foundation; either version 2 of the License, or (at your * 10 * option) any later version. * 11 \**************************************************************************/ 12 12 13 // Load the lang of the module. 13 if(isset($offline_language)) { //Expresso offline, quando o gears sincroniza com uma nova versão, não é dado acesso as sessões do usuário, e é preciso o nome do arquivo de linguagens na session abaixo. 14 $_SESSION['phpgw_info']['expressomail']['user']['preferences']['common']['lang'] = $offline_language; 14 if(isset($offline_language)) { //Expresso offline, quando o gears sincroniza com uma nova versão, não é dado acesso as sessões do usuário, e é preciso o nome do arquivo de linguagens na session abaixo. 15 $_SESSION['phpgw_info']['expressomail']['user']['preferences']['common']['lang'] = $offline_language; 16 } 17 18 if(!$_SESSION['phpgw_info']['expressomail']['lang']) 19 { 20 $array_keys = array(); 21 $fn = 'setup/phpgw_'.$_SESSION['phpgw_info']['expressomail']['user']['preferences']['common']['lang'].'.lang'; 22 if (file_exists($fn)){ 23 $fp = fopen($fn,'r'); 24 while ($data = fgets($fp,16000)){ 25 list($message_id,$app_name,$null,$content) = explode("\t",substr($data,0,-1)); 26 $_SESSION['phpgw_info']['expressomail']['lang'][$message_id] = $content; 27 } 28 fclose($fp); 15 29 } 16 17 if(!$_SESSION['phpgw_info']['expressomail']['lang']) 18 { 19 $array_keys = array(); 20 $fn = 'setup/phpgw_'.$_SESSION['phpgw_info']['expressomail']['user']['preferences']['common']['lang'].'.lang'; 21 if (file_exists($fn)){ 22 $fp = fopen($fn,'r'); 23 while ($data = fgets($fp,16000)){ 24 list($message_id,$app_name,$null,$content) = explode("\t",substr($data,0,-1)); 25 $_SESSION['phpgw_info']['expressomail']['lang'][$message_id] = $content; 26 } 27 fclose($fp); 28 } 29 } 30 31 foreach($_SESSION['phpgw_info']['expressomail']['lang'] as $key => $value) 32 $script .= "array_lang['".str_replace("'","\'",strtolower($key))."'] = '".str_replace("'","\'",$value)."';\n"; 33 echo "<script type='text/javascript'>var array_lang = new Array();$script</script>"; 30 } 31 32 foreach($_SESSION['phpgw_info']['expressomail']['lang'] as $key => $value) 33 $script .= "array_lang['".str_replace("'","\'",strtolower($key))."'] = '".str_replace("'","\'",$value)."';\n"; 34 35 $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = '<script type="text/javascript">var array_lang = new Array();'.$script.'</script>'; 34 36 ?> -
trunk/expressoMail1_2/index.php
r2529 r2549 139 139 if(!$var_tokens) 140 140 { 141 $var_tokens = 'ePass2000Lx;/usr/lib/libepsng_p11.so,ePass2000Win;c:/windows/system32/ngp11v211.dll ';141 $var_tokens = 'ePass2000Lx;/usr/lib/libepsng_p11.so,ePass2000Win;c:/windows/system32/ngp11v211.dll;'; 142 142 } 143 144 145 if ( ! @is_object($GLOBALS['phpgw']->js ) )146 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');147 143 148 144 $GLOBALS['phpgw']->js->validate_file( 'dJSWin', 'dJSWin' ); … … 168 164 $GLOBALS['phpgw']->js->validate_file( 'jscode', 'wfolders', 'expressoMail1_2' ); 169 165 170 if ( $GLOBALS['phpgw_info']['user']['preferences']['expressoMail']['use_shortcuts'])171 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'shortcut', 'expressoMail1_2' );166 if ( $GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'expressoMail' ][ 'use_shortcuts' ] ) 167 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'shortcut', 'expressoMail1_2' ); 172 168 173 if ( $_SESSION['phpgw_info']['user']['preferences']['expressoMail']['use_local_messages'])174 $GLOBALS[ 'phpgw']->js->validate_file( 'jscode', 'gears_init', 'expressoMail1_2' );169 if ( $_SESSION[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'expressoMail' ][ 'use_local_messages' ] ) 170 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'jscode', 'gears_init', 'expressoMail1_2' ); 175 171 176 172 … … 181 177 $script .= '<link rel="stylesheet" type="text/css" href="' . $phpgwapi_url . '/js/dftree/dftree.css">'; 182 178 $script .= '<style type="text/css">@import url(' . $phpgwapi_url . '/js/jscalendar/calendar-win2k-1.css);</style>'; 183 $script .= '<script type="text/javascript">var template = "' . $GLOBALS['phpgw_info']['server']['template_set'] . '";'; 184 $script .= 'var special_folders = new Array(4);'; 185 $script .= 'special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"] = \'Trash\';'; 186 $script .= 'special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"] = \'Drafts\';'; 187 $script .= 'special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"] = \'Spam\';'; 188 $script .= 'special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"] = \'Sent\';'; 189 $script .= 'var trashfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'";'; 190 $script .= 'var draftsfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'";'; 191 $script .= 'var sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'";'; 192 $script .= 'var spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'";'; 193 $script .= 'var token_param = "'.$var_tokens.'";'; 194 $script .= 'var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'";'; 195 $script .= 'var account_id = ' . $GLOBALS['phpgw_info']['user']['account_id'] . ';var expresso_offline = false;</script>'; 179 $script .= '<script type="text/javascript">'; 180 $script .= ' special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'"] = \'Trash\';'; 181 $script .= ' special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'"] = \'Drafts\';'; 182 $script .= ' special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'"] = \'Spam\';'; 183 $script .= ' special_folders["'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'"] = \'Sent\';'; 184 $script .= ' trashfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultTrashFolder'].'";'; 185 $script .= ' draftsfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultDraftsFolder'].'";'; 186 $script .= ' sentfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSentFolder'].'";'; 187 $script .= ' spamfolder = "'.$_SESSION['phpgw_info']['expressomail']['email_server']['imapDefaultSpamFolder'].'";'; 188 $script .= ' token_param = "'.$var_tokens.'";'; 189 $script .= ' var locale = "'.$GLOBALS['phpgw']->common->getPreferredLanguage().'";'; 190 $script .= ' var account_id = ' . $GLOBALS['phpgw_info']['user']['account_id'] . ';'; 191 $script .= ' expresso.connector.updateVersion = "'. $GLOBALS['phpgw_info']['flags']['update_version'] . '";'; 192 $script .= ' init( );'; 196 193 $script .= '</script>'; 197 194 198 $ update_version = $GLOBALS['phpgw_info']['flags']['update_version'];195 $GLOBALS['phpgw_info']['flags']['java_script'] = $script; 199 196 200 echo $script 201 . $GLOBALS[ 'phpgw' ] -> common -> get_java_script( ) 202 . '<script language="Javascript">expresso.connector.updateVersion = "'. $update_version . '";init();</script>'; 197 echo '<!-----Expresso Mail - Version Updated:' . $GLOBALS['phpgw_info']['flags']['update_version'] . '-------->'; 203 198 ?> 204 <!-----Expresso Mail - Version Updated:<?=$update_version?>--------> -
trunk/expressoMail1_2/js/jscode/globals.js
r2519 r2549 45 45 var denyFileExtensions = new Array('exe','com','reg','chm','cnf','hta','ins','jse','job','lnk','pif','src','scf','sct','shb','vbe','vbs','wsc','wsf','wsh','cer','its','mau','','mda','mar','mdz','prf','pst'); 46 46 47 var special_folders = new Array(4); 48 var trashfolder = 'Trash'; 49 var draftsfolder = 'Drafts'; 50 var sentfolder = 'Sent'; 51 var spamfolder = 'Spam'; 52 var token_param = ''; 53 var expresso_offline = false; -
trunk/home.php
r2369 r2549 27 27 $GLOBALS['phpgw_info']['flags'] = array( 28 28 'currentapp' => 'home', 29 'noheader' => ( ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) ) ? true : false ),30 'nonavbar' => ( ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) ) ? true : false ),29 //'noheader' => ( ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) ) ? true : false ), 30 //'nonavbar' => ( ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) ) ? true : false ), 31 31 'enable_network_class' => True, 32 32 'enable_contacts_class' => True, -
trunk/phpgwapi/inc/class.common.inc.php
r2547 r2549 368 368 define('PHPGW_FINAL',True); 369 369 370 $module_content = ob_get_contents( ); 371 372 ob_clean( ); 373 374 /*************************************************************************\ 375 * Load the header unless the developer turns it off * 376 \*************************************************************************/ 377 if ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) || array_key_exists( 'BackgroundRequest', $_GET ) ) 378 $GLOBALS['phpgw_info']['flags'] = array_merge( $GLOBALS['phpgw_info']['flags'], array( 379 'noheader' => true, 380 'nonavbar' => true 381 ) ); 382 383 if ( ! @$GLOBALS['phpgw_info']['flags']['noheader'] ) 384 { 385 if ( ! isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script_thirst' ] ) ) 386 $GLOBALS['phpgw_info']['flags']['java_script_thirst'] = ''; 387 388 $GLOBALS['phpgw_info']['flags']['java_script_thirst'] .= '<script type="text/javascript">var URL_SERVER = "' 389 . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] . '";' 390 . 'var template = "' . $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ] . '";</script>'; 391 392 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'wz_dragdrop', 'wz_dragdrop', NULL, true ); 393 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'expressoAjax', 'expressoAjax', NULL, true ); 394 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xlink', NULL, true ); 395 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xconnector', NULL, true ); 396 $GLOBALS[ 'phpgw' ] -> js -> validate_file( 'tools','xevent', NULL, true ); 397 398 $this -> phpgw_header( ); 399 } 400 else 401 echo $this -> get_java_script( ); 402 403 echo $module_content; 404 370 405 /*if (is_object($GLOBALS['phpgw']->accounts)) 371 406 { 372 407 $GLOBALS['phpgw']->accounts->save_session_cache(); 373 408 }*/ 409 374 410 // call the asyncservice check_run function if it is not explicitly set to cron-only 375 411 // … … 378 414 ExecMethod('phpgwapi.asyncservice.check_run','fallback'); 379 415 } 416 380 417 /* Clean up mcrypt */ 381 418 if (@is_object($GLOBALS['phpgw']->crypto)) … … 384 421 unset($GLOBALS['phpgw']->crypto); 385 422 } 423 386 424 $GLOBALS['phpgw']->db->disconnect(); 387 425 } … … 1213 1251 // add a content-type header to overwrite an existing default charset in apache (AddDefaultCharset directiv) 1214 1252 header('Content-type: text/html; charset='.$GLOBALS['phpgw']->translation->charset()); 1215 include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] 1216 . '/head.inc.php'); 1253 1254 include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/head.inc.php'); 1255 1217 1256 $this->navbar(False); 1218 include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] 1219 . '/navbar.inc.php'); 1220 1221 if(!@is_object($GLOBALS['phpgw']->js)) 1222 { 1223 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript'); 1224 } 1225 1226 $GLOBALS['phpgw']->js->validate_file( 'tools','xevent' ); 1227 $GLOBALS['phpgw']->js->validate_file( 'tools','xconnector' ); 1228 $GLOBALS['phpgw']->js->validate_file( 'tools','xlink' ); 1229 1230 $GLOBALS['phpgw']->js->validate_file('expressoAjax','expressoAjax'); 1231 1232 $GLOBALS['phpgw']->js->validate_file('wz_dragdrop','wz_dragdrop'); 1233 1234 echo "\n<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>\n"; 1235 echo $GLOBALS['phpgw']->js->get_script_links(); 1236 1237 $GLOBALS['phpgw']->js->unset_script_link( 'phpgwapi','tools' ); 1238 1239 $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','expressoAjax'); 1240 1241 // TODO 1242 // Esse javascript será carregado sempre pois causa grandes 1243 // problemas em diversos módulos. Algum dia será substituido. 1244 $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','wz_dragdrop'); 1257 1258 include(PHPGW_INCLUDE_ROOT . '/phpgwapi/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/navbar.inc.php'); 1245 1259 1246 1260 if (!@$GLOBALS['phpgw_info']['flags']['nonavbar'] && !@$GLOBALS['phpgw_info']['flags']['navbar_target']) 1247 {1248 1261 echo parse_navbar(); 1249 }1250 1262 } 1251 1263 … … 1343 1355 * @return string the javascript to be included 1344 1356 */ 1345 function get_java_script( )1357 function get_java_script( ) 1346 1358 { 1347 1359 $java_script = ''; … … 1349 1361 /* this flag is for all javascript code that has to be put before other jscode. 1350 1362 Think of conf vars etc... (pim@lingewoud.nl) */ 1351 if (isset($GLOBALS['phpgw_info']['flags']['java_script_thirst'])) 1352 { 1353 $java_script .= $GLOBALS['phpgw_info']['flags']['java_script_thirst'] . "\n"; 1354 } 1355 1356 if(@is_object($GLOBALS['phpgw']->js)) 1357 { 1358 $java_script .= $GLOBALS['phpgw']->js->get_script_links(); 1359 } 1363 if ( isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script_thirst' ] ) ) 1364 $java_script .= $GLOBALS['phpgw_info']['flags']['java_script_thirst']; 1365 1366 if( is_object( $GLOBALS[ 'phpgw' ] -> js ) ) 1367 $java_script .= $GLOBALS[ 'phpgw' ] -> js -> get_script_links( ); 1360 1368 1361 1369 if(@isset($_GET['menuaction'])) … … 1368 1376 } 1369 1377 } 1370 if (isset($GLOBALS['phpgw_info']['flags']['java_script'])) 1371 {1372 $java_script .= $GLOBALS[ 'phpgw_info']['flags']['java_script'] . "\n";1373 } 1378 1379 if ( isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ] ) ) 1380 $java_script .= $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'java_script' ]; 1381 1374 1382 return $java_script; 1375 1383 } -
trunk/phpgwapi/inc/class.javascript.inc.php
r2547 r2549 49 49 * @var array list of validated files to be included in the head section of a page 50 50 */ 51 var $files;51 private $files = array( ); 52 52 53 53 /** … … 153 153 $links .= '<script type="text/javascript" src="' 154 154 . $GLOBALS['phpgw_info']['server']['webserver_url'] 155 . "/$app/js/$pkg/$file" . '.js ">'155 . "/$app/js/$pkg/$file" . '.js?' . microtime( true ) . '">' 156 156 . "</script>\n"; 157 157 } 158 159 $this -> unset_script_link( $app, $pkg, $file ); 158 160 } 159 161 } … … 223 225 * @returns bool was the file found? 224 226 */ 225 function validate_file($package, $file, $app='phpgwapi') 226 { 227 if(is_readable(PHPGW_INCLUDE_ROOT .SEP .$app .SEP .'js' .SEP . $package .SEP. $file . '.js')) 228 { 229 $this->files[$app][$package][$file] = $file; 230 return True; 231 } 232 elseif($app != 'phpgwapi') 233 { 234 if(is_readable(PHPGW_INCLUDE_ROOT .SEP .'phpgwapi' .SEP .'js' .SEP . $package .SEP . $file . '.js')) 235 { 236 $this->files['phpgwapi'][$package][$file] = $file; 237 return True; 238 } 239 return False; 240 } 227 function validate_file( $package, $file, $app = NULL, $stack = false ) 228 { 229 if ( $app == NULL ) 230 $app = 'phpgwapi'; 231 232 $_file = PHPGW_INCLUDE_ROOT . SEP . $app . SEP . 'js' . SEP . $package . SEP. $file . '.js'; 233 if ( is_readable( $_file ) ) 234 { 235 unset( $_file ); 236 237 if ( ! array_key_exists( $app, $this -> files ) ) 238 $this -> files[ $app ] = array( ); 239 240 if ( ! array_key_exists( $package, $this -> files[ $app ] ) ) 241 $this -> files[ $app ][ $package ] = array( ); 242 243 if ( $stack ) 244 $this -> files[ $app ][ $package ] = array_merge( array( $file => $file ), $this -> files[ $app ][ $package ] ); 245 else 246 $this -> files[ $app ][ $package ][ $file ] = $file; 247 248 return true; 249 } 250 return false; 241 251 } 242 252 } -
trunk/phpgwapi/inc/class.preferences.inc.php
r2002 r2549 174 174 foreach($val as $k => $v) 175 175 { 176 if (!is_array($v) && strstr($val,'$$') !== False)176 if (!is_array($v) && is_string( $val ) && strstr($val,'$$') !== False) 177 177 { 178 178 $this->data[$app][$key][$k] = $this->parse_notify($v); -
trunk/phpgwapi/inc/functions.inc.php
r2419 r2549 30 30 error_reporting(error_reporting() & ~E_NOTICE); 31 31 32 include (PHPGW_API_INC.'/common_functions.inc.php');32 include_once(PHPGW_API_INC.'/common_functions.inc.php'); 33 33 34 34 /*! … … 234 234 $GLOBALS['phpgw']->preferences = CreateObject('phpgwapi.preferences'); 235 235 $GLOBALS['phpgw']->applications = CreateObject('phpgwapi.applications'); 236 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript'); 236 237 print_debug('main class loaded', 'messageonly','api'); 237 238 if (! isset($GLOBALS['phpgw_info']['flags']['included_classes']['error']) || … … 403 404 ! $GLOBALS['phpgw_info']['user']['apps']['admin'])) 404 405 { 405 $GLOBALS['phpgw']->common->phpgw_header();406 //$GLOBALS['phpgw']->common->phpgw_header(); 406 407 407 408 $GLOBALS['phpgw']->log->write(array('text'=>'W-Permissions, Attempted to access %1','p1'=>$GLOBALS['phpgw_info']['flags']['currentapp'])); … … 416 417 $GLOBALS['phpgw']->datetime = CreateObject('phpgwapi.date_time'); 417 418 } 419 418 420 $GLOBALS['phpgw']->applications->read_installed_apps(); // to get translated app-titles 419 420 /*************************************************************************\ 421 * Load the header unless the developer turns it off * 422 \*************************************************************************/ 423 if ( array_key_exists( 'HTTP_BACKGROUNDREQUEST', $_SERVER ) || array_key_exists( 'BackgroundRequest', $_GET ) ) 424 { 425 $GLOBALS['phpgw_info']['flags'] = array( 426 'noheader' => true, 427 'nonavbar' => true 428 ); 429 } 430 if (!@$GLOBALS['phpgw_info']['flags']['noheader']) 431 { 432 $GLOBALS['phpgw']->common->phpgw_header(); 433 } 434 } 421 }
Note: See TracChangeset
for help on using the changeset viewer.