apply api change from yesterday

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2657 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/mod/languages/mod_php/freeswitch.php

@@ -2,7 +2,7 @@
 
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.29
+ * Version 1.3.21
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -16,7 +16,7 @@ $FREESWITCH_LOADED__ = true;
 
 /* if our extension has not been loaded, do what we can */
 if (!extension_loaded("php_freeswitch")) {
-  if (!dl("php_freeswitch.so")) return;
+	if (!dl("php_freeswitch.so")) return;
 }
 
 

src/mod/languages/mod_php/php_freeswitch.h

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.29
+ * Version 1.3.21
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -40,10 +40,6 @@ extern zend_module_entry freeswitch_module_entry;
 # define PHP_FREESWITCH_API
 #endif
 
-#ifdef ZTS
-#include "TSRM.h"
-#endif
-
 PHP_MINIT_FUNCTION(freeswitch);
 PHP_MSHUTDOWN_FUNCTION(freeswitch);
 PHP_RINIT_FUNCTION(freeswitch);
@@ -76,4 +72,24 @@ ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_session_transfer);
 ZEND_NAMED_FUNCTION(_wrap_fs_switch_ivr_speak_text);
 ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_get_variable);
 ZEND_NAMED_FUNCTION(_wrap_fs_switch_channel_set_variable);
+/*If you declare any globals in php_freeswitch.h uncomment this:
+ZEND_BEGIN_MODULE_GLOBALS(freeswitch)
+ZEND_END_MODULE_GLOBALS(freeswitch)
+*/
+#ifdef ZTS
+#define FREESWITCH_D  zend_freeswitch_globals *freeswitch_globals
+#define FREESWITCH_DC  , FREESWITCH_D
+#define FREESWITCH_C  freeswitch_globals
+#define FREESWITCH_CC  , FREESWITCH_C
+#define FREESWITCH_SG(v)  (freeswitch_globals->v)
+#define FREESWITCH_FETCH()  zend_freeswitch_globals *freeswitch_globals = ts_resource(freeswitch_globals_id)
+#else
+#define FREESWITCH_D
+#define FREESWITCH_DC
+#define FREESWITCH_C
+#define FREESWITCH_CC
+#define FREESWITCH_SG(v)  (freeswitch_globals.v)
+#define FREESWITCH_FETCH()
+#endif
+
 #endif /* PHP_FREESWITCH_H */

src/mod/languages/mod_php/switch_swig.c

@@ -257,6 +257,7 @@ int fs_switch_ivr_originate       (switch_core_session_t *session,
         switch_core_session_t *peer_session;
         unsigned int timelimit = 60;
         char *var;
+		switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING;
 
         caller_channel = switch_core_session_get_channel(session);
         assert(caller_channel != NULL);
@@ -265,7 +266,7 @@ int fs_switch_ivr_originate       (switch_core_session_t *session,
                 timelimit = atoi(var);
         }
         
-        if (switch_ivr_originate(session, &peer_session, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
+        if (switch_ivr_originate(session, &peer_session, &cause, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) {
                 switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n");
                 switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
                 return;