Changeset 2748
- Timestamp:
- 05/10/10 11:47:10 (14 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/class.uicalendar.inc.php
r2549 r2748 5218 5218 '</tr>'. 5219 5219 '</table>'. 5220 '<script type="text/javascript" src=" phpgwapi/js/dJSWin/dJSWin.js"></script>'.5221 "<script src='calendar/js/edit_exmail.js' type='text/javascript'></script>".5220 '<script type="text/javascript" src="' . $GLOBALS[ 'phpgw' ] -> link( '/phpgwapi/js/dJSWin/dJSWin.js' ) .'"></script>'. 5221 '<script src="' . $GLOBALS[ 'phpgw' ] -> link( '/calendar/js/edit_exmail.js' ) . '" type="text/javascript"></script>' . 5222 5222 $load_lang_vars. 5223 5223 "<script type='text/javascript'>var DEFAULT_URL = '".$module_name."/controller.php?action=';</script> ". -
trunk/calendar/js/edit.js
r1643 r2748 62 62 participants+=combo[i].value+","; 63 63 } 64 url = 'index.php?menuaction=calendar.uicalendar.disponibility&participants='+participants+'&date='+document.getElementById('start[str]').value;64 url = ExpressoLivre.path( ) + 'index.php?menuaction=calendar.uicalendar.disponibility&BackgroundRequest='+Date.parse( new Date )+'&participants='+participants+'&date='+document.getElementById('start[str]').value; 65 65 66 66 //alert(url); -
trunk/calendar/js/edit_exmail.js
r2630 r2748 56 56 var handler_get_available_users = function(data) 57 57 { 58 data = data.JSON( ); 58 59 select_available_users = Element('user_list_in'); 59 60 … … 90 91 } 91 92 var context = document.getElementById('combo_org').value; 92 cExecute (module+'.ldap_functions.get_available_users&context='+context+'&type='+type, handler_get_available_users); 93 ExpressoLivre.go( { 94 "access" : module+'.ldap_functions.get_available_users&context='+context+'&type='+type, 95 "handler" : handler_get_available_users 96 } ); 93 97 } 94 98 … … 145 149 if (oText.value.length >= numMin){ 146 150 var context = document.getElementById('combo_org').value; 147 cExecute ('expressoMail1_2.ldap_functions.search_users&context='+(context)+'&type='+(type == '' ? 'list' : 'search')+'&filter='+oText.value, handler_get_available_users); 151 ExpressoLivre.go( { 152 "access" : 'expressoMail1_2.ldap_functions.search_users&context='+escape(context)+'&type='+(type == '' ? 'list' : 'search')+'&filter='+oText.value, 153 "handler" : handler_get_available_users 154 } ); 148 155 oWait.innerHTML = ' '; 149 156 } -
trunk/index.php
r2707 r2748 92 92 if ( is_object( $GLOBALS[ $class ] ) && ( ( ! property_exists( $class, 'public_functions' ) ) || (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions[$method]) && ! $invalid_data ) ) 93 93 { 94 $menuaction = $_GET[ 'menuaction' ]; 95 unset( $_GET[ 'menuaction' ] ); 96 echo execmethod( $menuaction, $_GET ); 94 echo execmethod( $_GET[ 'menuaction' ], $_GET ); 97 95 unset($app); 98 96 unset($class); -
trunk/phpgwapi/inc/class.javascript.inc.php
r2628 r2748 267 267 function get_source( $param ) 268 268 { 269 ob_start( ); 269 270 $source = ''; 270 271 foreach( explode( ';', $param[ 'source' ] ) as $script ) 271 $source .= file_get_contents( realpath( dirname( __FILE__ ) . '/../..' ) . $script ); 272 if ( strrpos( $script, '.php' ) != strlen( $script ) - 4 ) 273 $source .= file_get_contents( realpath( dirname( __FILE__ ) . '/../..' ) . $script ); 274 else 275 { 276 include_once realpath( dirname( __FILE__ ) . '/../..' ) . $script; 277 $source .= ob_get_contents( ); 278 ob_clean( ); 279 } 272 280 273 281 echo $source; -
trunk/phpgwapi/inc/jscalendar-setup.php
r2 r2748 24 24 ); 25 25 26 include ('../../header.inc.php');26 include_once dirname( __FILE__ ) . '/../../header.inc.php'; 27 27 header('Content-type: text/javascript; charset='.$GLOBALS['phpgw']->translation->charset()); 28 28 $GLOBALS['phpgw']->translation->add_app('jscalendar');
Note: See TracChangeset
for help on using the changeset viewer.