From 645825eca3742d4a4f8c2cd2bca22955758fb6f2 Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sat, 30 Jan 2021 19:41:34 -0500 Subject: [PATCH] fix --- mermsemr/etc/mermsemr_api.conf | 9 +- mermsemr/src/autom4te.cache/output.0 | 92 +++--- mermsemr/src/autom4te.cache/requests | 100 +++--- mermsemr/src/autom4te.cache/traces.0 | 8 +- mermsemr/src/confdefs.h | 2 +- mermsemr/src/config.h | 4 +- mermsemr/src/config.h.in | 4 +- mermsemr/src/config.h.in~ | 4 +- mermsemr/src/config.m4 | 34 +- mermsemr/src/configure | 92 +++--- mermsemr/src/core/mermsemr_api.cc | 24 +- mermsemr/src/include/medTEmails.h | 1 + mermsemr/src/include/mermsemr_api.h | 50 +-- mermsemr/src/include/php_mermsemr_api.h | 16 +- mermsemr/src/include/php_mermsemr_api_ns.h | 2 +- mermsemr/src/libtool | 4 +- mermsemr/src/mailsend/Makefile | 10 +- mermsemr/src/mailsend/libs/libmsock/Makefile | 8 +- mermsemr/src/mailsend/libs/libmutils/Makefile | 8 +- mermsemr/src/mailsend/libs/libsll/Makefile | 2 +- .../src/shared_tool/function_backoffice.cc | 2 +- mermsemr/src/shared_tool/medTEmails.cc | 83 ++--- mermsemr/src/shared_tool/medTrBackOffice.cc | 23 +- mermsemr/src/shared_tool/mermsemr_api_main.cc | 14 +- mermsemr/src/shared_tool/providers.cc | 297 +++++++++++------- 25 files changed, 501 insertions(+), 392 deletions(-) diff --git a/mermsemr/etc/mermsemr_api.conf b/mermsemr/etc/mermsemr_api.conf index 4c58a69..7ec003e 100644 --- a/mermsemr/etc/mermsemr_api.conf +++ b/mermsemr/etc/mermsemr_api.conf @@ -14,7 +14,8 @@ system: database: { - host = "127.0.0.1"; + hostold = "127.0.0.1"; + host = "10.20.30.60"; name = "mermsemr_dev"; user = "mermsemr"; pass = "mermsemr"; @@ -23,11 +24,11 @@ database: mailsend: { - from = "savvy@chiefsoft.com"; + from = "test@wrenchboard.com"; server = "smtp.gmail.com"; domain = "mermsemr.com"; - user = "savvy@chiefsoft.com"; - pass = "may12002!"; + user = "test@wrenchboard.com"; + pass = "Jf6acQBAwXdf7bUr"; name = "MERMS EHR"; }; diff --git a/mermsemr/src/autom4te.cache/output.0 b/mermsemr/src/autom4te.cache/output.0 index 3c10a1a..c903ec7 100644 --- a/mermsemr/src/autom4te.cache/output.0 +++ b/mermsemr/src/autom4te.cache/output.0 @@ -727,7 +727,7 @@ ac_user_opts=' enable_option_checking with_libdir with_php_config -enable_mermsemr_api_oameye +enable_mermsemr_api_sameye enable_shared enable_static with_pic @@ -1367,7 +1367,7 @@ Optional Features and Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-libdir=NAME Look for libraries in .../NAME rather than .../lib --with-php-config=PATH Path to php-config php-config - --enable-mermsemr_api_oameye Enable "mermsemr_api_oameye" extension support + --enable-mermsemr_api_sameye Enable "mermsemr_api_sameye" extension support --enable-shared@<:@=PKGS@:>@ build shared libraries @<:@default=yes@:>@ --enable-static@<:@=PKGS@:>@ build static libraries @<:@default=yes@:>@ --with-pic@<:@=PKGS@:>@ try to use only PIC/non-PIC objects @<:@default=use @@ -3986,17 +3986,17 @@ $as_echo "no" >&6; } -php_enable_mermsemr_api_oameye=no +php_enable_mermsemr_api_sameye=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to enable the \"mermsemr_api_oameye\" extension" >&5 -$as_echo_n "checking Whether to enable the \"mermsemr_api_oameye\" extension... " >&6; } -@%:@ Check whether --enable-mermsemr_api_oameye was given. -if test "${enable_mermsemr_api_oameye+set}" = set; then : - enableval=$enable_mermsemr_api_oameye; PHP_MERMSEMR_API_OAMEYE=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to enable the \"mermsemr_api_sameye\" extension" >&5 +$as_echo_n "checking Whether to enable the \"mermsemr_api_sameye\" extension... " >&6; } +@%:@ Check whether --enable-mermsemr_api_sameye was given. +if test "${enable_mermsemr_api_sameye+set}" = set; then : + enableval=$enable_mermsemr_api_sameye; PHP_MERMSEMR_API_SAMEYE=$enableval else - PHP_MERMSEMR_API_OAMEYE=no - test "$PHP_ENABLE_ALL" && PHP_MERMSEMR_API_OAMEYE=$PHP_ENABLE_ALL + PHP_MERMSEMR_API_SAMEYE=no + test "$PHP_ENABLE_ALL" && PHP_MERMSEMR_API_SAMEYE=$PHP_ENABLE_ALL fi @@ -4004,12 +4004,12 @@ fi ext_output="yes, shared" ext_shared=yes -case $PHP_MERMSEMR_API_OAMEYE in +case $PHP_MERMSEMR_API_SAMEYE in shared,*) - PHP_MERMSEMR_API_OAMEYE=`echo "$PHP_MERMSEMR_API_OAMEYE"|$SED 's/^shared,//'` + PHP_MERMSEMR_API_SAMEYE=`echo "$PHP_MERMSEMR_API_SAMEYE"|$SED 's/^shared,//'` ;; shared) - PHP_MERMSEMR_API_OAMEYE=yes + PHP_MERMSEMR_API_SAMEYE=yes ;; no) ext_output=no @@ -4024,7 +4024,7 @@ esac ext_output="yes, shared" ext_shared=yes - test "$PHP_MERMSEMR_API_OAMEYE" = "no" && PHP_MERMSEMR_API_OAMEYE=yes + test "$PHP_MERMSEMR_API_SAMEYE" = "no" && PHP_MERMSEMR_API_SAMEYE=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 @@ -4033,7 +4033,7 @@ $as_echo "$ext_output" >&6; } -if test $PHP_MERMSEMR_API_OAMEYE != "no"; then +if test $PHP_MERMSEMR_API_SAMEYE != "no"; then if test -z "$php_cxx_done"; then ac_ext=cpp @@ -4440,7 +4440,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi - PHP_VAR_SUBST="$PHP_VAR_SUBST MERMSEMR_API_OAMEYE_SHARED_LIBADD" + PHP_VAR_SUBST="$PHP_VAR_SUBST MERMSEMR_API_SAMEYE_SHARED_LIBADD" @@ -4448,7 +4448,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lstdc++" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lstdc++" else @@ -4499,7 +4499,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="-lpq $MERMSEMR_API_OAMEYE_SHARED_LIBADD" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="-lpq $MERMSEMR_API_SAMEYE_SHARED_LIBADD" if test -n "/usr/lib64"; then if test "/usr/lib64" != "/usr/$PHP_LIBDIR" && test "/usr/lib64" != "/usr/lib"; then @@ -4516,8 +4516,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="-L$ai_p $MERMSEMR_API_OAMEYE_SHARED_LIBADD" - test -n "$ld_runpath_switch" && MERMSEMR_API_OAMEYE_SHARED_LIBADD="$ld_runpath_switch$ai_p $MERMSEMR_API_OAMEYE_SHARED_LIBADD" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="-L$ai_p $MERMSEMR_API_SAMEYE_SHARED_LIBADD" + test -n "$ld_runpath_switch" && MERMSEMR_API_SAMEYE_SHARED_LIBADD="$ld_runpath_switch$ai_p $MERMSEMR_API_SAMEYE_SHARED_LIBADD" else @@ -4599,7 +4599,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lcurl" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lcurl" else @@ -4622,7 +4622,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lconfig++" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lconfig++" else @@ -4645,7 +4645,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -ljson-c" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -ljson-c" else @@ -4668,7 +4668,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lssl" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lssl" else @@ -4691,7 +4691,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lz" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lz" else @@ -4714,7 +4714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lpcrecpp" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lpcrecpp" else @@ -4737,7 +4737,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lgcc_s" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lgcc_s" else @@ -4767,7 +4767,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_extra=`echo "-I@ext_srcdir@/libconfig-1.0.1"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_MERMSEMR_API_OAMEYE_SHARED=no + PHP_MERMSEMR_API_SAMEYE_SHARED=no case $ext_dir in @@ -4811,13 +4811,13 @@ EOF done - EXT_STATIC="$EXT_STATIC mermsemr_api_oameye;$ext_dir" + EXT_STATIC="$EXT_STATIC mermsemr_api_sameye;$ext_dir" if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_oameye;$ext_dir" + EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_sameye;$ext_dir" fi else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_MERMSEMR_API_OAMEYE_SHARED=yes + PHP_MERMSEMR_API_SAMEYE_SHARED=yes case $ext_dir in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; @@ -4844,7 +4844,7 @@ EOF ac_obj=$1 IFS=$old_IFS - shared_objects_mermsemr_api_oameye="$shared_objects_mermsemr_api_oameye $ac_bdir$ac_obj.lo" + shared_objects_mermsemr_api_sameye="$shared_objects_mermsemr_api_sameye $ac_bdir$ac_obj.lo" case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; @@ -4870,32 +4870,32 @@ EOF esac if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mermsemr_api_oameye.$suffix" + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mermsemr_api_sameye.$suffix" else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/mermsemr_api_oameye.$suffix" + PHP_MODULES="$PHP_MODULES \$(phplibdir)/mermsemr_api_sameye.$suffix" fi - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mermsemr_api_oameye" + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mermsemr_api_sameye" cat >>Makefile.objects<>confdefs.h <<_ACEOF -@%:@define COMPILE_DL_MERMSEMR_API_OAMEYE 1 +@%:@define COMPILE_DL_MERMSEMR_API_SAMEYE 1 _ACEOF fi fi if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then - PHP_MERMSEMR_API_OAMEYE_SHARED=no + PHP_MERMSEMR_API_SAMEYE_SHARED=no case "$PHP_SAPI" in cgi|embed|phpdbg) @@ -4941,7 +4941,7 @@ EOF done - EXT_STATIC="$EXT_STATIC mermsemr_api_oameye;$ext_dir" + EXT_STATIC="$EXT_STATIC mermsemr_api_sameye;$ext_dir" ;; *) @@ -4989,7 +4989,7 @@ EOF ;; esac - EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_oameye;$ext_dir" + EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_sameye;$ext_dir" fi @@ -4998,20 +4998,20 @@ EOF if test "$ext_builddir" = "."; then - PHP_PECL_EXTENSION=mermsemr_api_oameye + PHP_PECL_EXTENSION=mermsemr_api_sameye PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - echo "#define MERMSEMR_API_OAMEYE_NS \"mermsemr_api_oameye\"" > include/php_mermsemr_api_oameye_ns.h + echo "#define MERMSEMR_API_SAMEYE_NS \"mermsemr_api_sameye\"" > include/php_mermsemr_api_sameye_ns.h echo "#define MERMSEMR_CONFIG \"`pwd|sed s/src//`etc/\"" > include/php_mermsemr_config.h - echo "#define MERMSEMR_LOG \"`pwd|sed s/src//`logs/mermsemr_api_oameye.log\"" > include/php_mermsemr_log.h + echo "#define MERMSEMR_LOG \"`pwd|sed s/src//`logs/mermsemr_api_sameye.log\"" > include/php_mermsemr_log.h echo "#define TMPL_PREFIX \"`pwd|sed s/src//`email/\"" > include/php_tmpl_prefix.h diff --git a/mermsemr/src/autom4te.cache/requests b/mermsemr/src/autom4te.cache/requests index ceb4dae..c663882 100644 --- a/mermsemr/src/autom4te.cache/requests +++ b/mermsemr/src/autom4te.cache/requests @@ -15,63 +15,63 @@ 'configure.ac' ], { - 'AM_MAKEFILE_INCLUDE' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AC_CONFIG_FILES' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_FC_SRCEXT' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'AM_PROG_CXX_C_O' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'AM_PROG_AR' => 1, - 'AC_SUBST' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'm4_sinclude' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'AC_FC_PP_DEFINE' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'AC_CONFIG_LINKS' => 1, - 'AC_LIBSOURCE' => 1, - 'AC_SUBST_TRACE' => 1, - '_AM_COND_IF' => 1, - 'm4_pattern_forbid' => 1, - 'AM_NLS' => 1, - 'AM_ENABLE_MULTILIB' => 1, - '_AM_COND_ELSE' => 1, - 'AM_CONDITIONAL' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, - 'AM_PATH_GUILE' => 1, - 'AH_OUTPUT' => 1, - 'include' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_INIT' => 1, + '_AM_COND_ENDIF' => 1, '_AM_SUBST_NOTMAKE' => 1, - 'AM_AUTOMAKE_VERSION' => 1, + 'AM_PROG_MOC' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, 'AM_POT_TOOLS' => 1, - 'AC_CANONICAL_HOST' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'm4_sinclude' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'AC_SUBST' => 1, + 'AC_FC_FREEFORM' => 1, + 'm4_include' => 1, + 'AM_GNU_GETTEXT' => 1, + 'AM_PATH_GUILE' => 1, + 'AM_NLS' => 1, + 'AM_AUTOMAKE_VERSION' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'AM_PROG_F77_C_O' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AC_FC_FREEFORM' => 1, - 'AM_SILENT_RULES' => 1, - 'LT_INIT' => 1, - 'AM_MAINTAINER_MODE' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, + 'AC_CANONICAL_HOST' => 1, + 'AM_PROG_AR' => 1, '_m4_warn' => 1, - '_AM_COND_ENDIF' => 1, - 'm4_pattern_allow' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'AC_CONFIG_LINKS' => 1, + 'AC_FC_PP_SRCEXT' => 1, + 'LT_INIT' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'AH_OUTPUT' => 1, + 'AM_PROG_FC_C_O' => 1, 'AC_REQUIRE_AUX_FILE' => 1, - 'AM_PROG_MOC' => 1, - 'AM_INIT_AUTOMAKE' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'm4_include' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AC_SUBST_TRACE' => 1, + 'AM_SILENT_RULES' => 1, + 'm4_pattern_allow' => 1, + 'AC_CONFIG_FILES' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + '_AM_COND_ELSE' => 1, + 'm4_pattern_forbid' => 1, + 'AC_CANONICAL_BUILD' => 1, + 'include' => 1, + 'AC_FC_SRCEXT' => 1, + 'AC_INIT' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_LIBSOURCE' => 1, + 'AC_CONFIG_HEADERS' => 1, + 'AM_MAINTAINER_MODE' => 1, 'sinclude' => 1, - 'AM_GNU_GETTEXT' => 1, - 'AC_CONFIG_AUX_DIR' => 1 + 'AC_CANONICAL_TARGET' => 1, + 'AM_INIT_AUTOMAKE' => 1, + '_AM_COND_IF' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1 } ], 'Autom4te::Request' ) ); diff --git a/mermsemr/src/autom4te.cache/traces.0 b/mermsemr/src/autom4te.cache/traces.0 index 061ec36..88b5c49 100644 --- a/mermsemr/src/autom4te.cache/traces.0 +++ b/mermsemr/src/autom4te.cache/traces.0 @@ -308,10 +308,10 @@ m4trace:config.m4:6: -1- m4_pattern_allow([^CPPFLAGS$]) m4trace:config.m4:6: -1- AC_SUBST([CXXCPP]) m4trace:config.m4:6: -1- AC_SUBST_TRACE([CXXCPP]) m4trace:config.m4:6: -1- m4_pattern_allow([^CXXCPP$]) -m4trace:config.m4:23: -1- AC_DEFINE_TRACE_LITERAL([COMPILE_DL_MERMSEMR_API_OAMEYE]) -m4trace:config.m4:23: -1- m4_pattern_allow([^COMPILE_DL_MERMSEMR_API_OAMEYE$]) -m4trace:config.m4:23: -1- AH_OUTPUT([COMPILE_DL_MERMSEMR_API_OAMEYE], [/* Whether to build mermsemr_api_oameye as dynamic module */ -@%:@undef COMPILE_DL_MERMSEMR_API_OAMEYE]) +m4trace:config.m4:23: -1- AC_DEFINE_TRACE_LITERAL([COMPILE_DL_MERMSEMR_API_SAMEYE]) +m4trace:config.m4:23: -1- m4_pattern_allow([^COMPILE_DL_MERMSEMR_API_SAMEYE$]) +m4trace:config.m4:23: -1- AH_OUTPUT([COMPILE_DL_MERMSEMR_API_SAMEYE], [/* Whether to build mermsemr_api_sameye as dynamic module */ +@%:@undef COMPILE_DL_MERMSEMR_API_SAMEYE]) m4trace:configure.ac:149: -1- AC_PROG_LIBTOOL m4trace:configure.ac:149: -1- _m4_warn([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete. You should run autoupdate.], [aclocal.m4:3383: AC_PROG_LIBTOOL is expanded from... diff --git a/mermsemr/src/confdefs.h b/mermsemr/src/confdefs.h index 2f1db14..3d35921 100644 --- a/mermsemr/src/confdefs.h +++ b/mermsemr/src/confdefs.h @@ -5,7 +5,7 @@ #define PACKAGE_STRING "" #define PACKAGE_BUGREPORT "" #define PACKAGE_URL "" -#define COMPILE_DL_MERMSEMR_API_OAMEYE 1 +#define COMPILE_DL_MERMSEMR_API_SAMEYE 1 #define STDC_HEADERS 1 #define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_STAT_H 1 diff --git a/mermsemr/src/config.h b/mermsemr/src/config.h index 15c7aaa..49c96d6 100644 --- a/mermsemr/src/config.h +++ b/mermsemr/src/config.h @@ -1,8 +1,8 @@ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Whether to build mermsemr_api_oameye as dynamic module */ -#define COMPILE_DL_MERMSEMR_API_OAMEYE 1 +/* Whether to build mermsemr_api_sameye as dynamic module */ +#define COMPILE_DL_MERMSEMR_API_SAMEYE 1 /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 diff --git a/mermsemr/src/config.h.in b/mermsemr/src/config.h.in index 0713229..75232f3 100644 --- a/mermsemr/src/config.h.in +++ b/mermsemr/src/config.h.in @@ -1,7 +1,7 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Whether to build mermsemr_api_oameye as dynamic module */ -#undef COMPILE_DL_MERMSEMR_API_OAMEYE +/* Whether to build mermsemr_api_sameye as dynamic module */ +#undef COMPILE_DL_MERMSEMR_API_SAMEYE /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H diff --git a/mermsemr/src/config.h.in~ b/mermsemr/src/config.h.in~ index 75232f3..0713229 100644 --- a/mermsemr/src/config.h.in~ +++ b/mermsemr/src/config.h.in~ @@ -1,7 +1,7 @@ /* config.h.in. Generated from configure.ac by autoheader. */ -/* Whether to build mermsemr_api_sameye as dynamic module */ -#undef COMPILE_DL_MERMSEMR_API_SAMEYE +/* Whether to build mermsemr_api_oameye as dynamic module */ +#undef COMPILE_DL_MERMSEMR_API_OAMEYE /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H diff --git a/mermsemr/src/config.m4 b/mermsemr/src/config.m4 index 5251921..c4ff11d 100644 --- a/mermsemr/src/config.m4 +++ b/mermsemr/src/config.m4 @@ -1,33 +1,33 @@ -PHP_ARG_ENABLE(mermsemr_api_oameye, - [Whether to enable the "mermsemr_api_oameye" extension], - [ --enable-mermsemr_api_oameye Enable "mermsemr_api_oameye" extension support]) +PHP_ARG_ENABLE(mermsemr_api_sameye, + [Whether to enable the "mermsemr_api_sameye" extension], + [ --enable-mermsemr_api_sameye Enable "mermsemr_api_sameye" extension support]) -if test $PHP_MERMSEMR_API_OAMEYE != "no"; then +if test $PHP_MERMSEMR_API_SAMEYE != "no"; then PHP_REQUIRE_CXX() - PHP_SUBST(MERMSEMR_API_OAMEYE_SHARED_LIBADD) - PHP_ADD_LIBRARY(stdc++, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD) + PHP_SUBST(MERMSEMR_API_SAMEYE_SHARED_LIBADD) + PHP_ADD_LIBRARY(stdc++, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD) PHP_ADD_INCLUDE(/usr/include/pgsql) - PHP_ADD_LIBRARY_WITH_PATH(pq, /usr/lib64, MERMSEMR_API_OAMEYE_SHARED_LIBADD) - PHP_ADD_LIBRARY(curl, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD) - PHP_ADD_LIBRARY(config++, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD) - PHP_ADD_LIBRARY(json-c, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD) - PHP_ADD_LIBRARY(ssl, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD) - PHP_ADD_LIBRARY(z, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD) - PHP_ADD_LIBRARY(pcrecpp, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD) - PHP_ADD_LIBRARY(gcc_s, 1, MERMSEMR_API_OAMEYE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(pq, /usr/lib64, MERMSEMR_API_SAMEYE_SHARED_LIBADD) + PHP_ADD_LIBRARY(curl, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD) + PHP_ADD_LIBRARY(config++, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD) + PHP_ADD_LIBRARY(json-c, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD) + PHP_ADD_LIBRARY(ssl, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD) + PHP_ADD_LIBRARY(z, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD) + PHP_ADD_LIBRARY(pcrecpp, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD) + PHP_ADD_LIBRARY(gcc_s, 1, MERMSEMR_API_SAMEYE_SHARED_LIBADD) #LIBCFG_DIR="`pwd`/libconfig-1.3.1" #PHP_ADD_LIBRARY_WITH_PATH(config++, "$LIBCFG_DIR/.libs/") PHP_NEW_EXTENSION( - mermsemr_api_oameye, + mermsemr_api_sameye, core/*.cc shared_tool/*.cc, $ext_shared, ,-I@ext_srcdir@/libconfig-1.0.1) - PHP_DEFINE([MERMSEMR_API_OAMEYE_NS],[\"mermsemr_api_oameye\"],[]) + PHP_DEFINE([MERMSEMR_API_SAMEYE_NS],[\"mermsemr_api_sameye\"],[]) PHP_DEFINE([MERMSEMR_CONFIG],[\"`pwd|sed s/src//`etc/\"],[]) - PHP_DEFINE([MERMSEMR_LOG],[\"`pwd|sed s/src//`logs/mermsemr_api_oameye.log\"],[]) + PHP_DEFINE([MERMSEMR_LOG],[\"`pwd|sed s/src//`logs/mermsemr_api_sameye.log\"],[]) PHP_DEFINE([TMPL_PREFIX],[\"`pwd|sed s/src//`email/\"],[]) PHP_DEFINE([FILELOG_MAX_LEVEL],[9],[]) fi diff --git a/mermsemr/src/configure b/mermsemr/src/configure index b9a8365..5c29009 100755 --- a/mermsemr/src/configure +++ b/mermsemr/src/configure @@ -727,7 +727,7 @@ ac_user_opts=' enable_option_checking with_libdir with_php_config -enable_mermsemr_api_oameye +enable_mermsemr_api_sameye enable_shared enable_static with_pic @@ -1367,7 +1367,7 @@ Optional Features and Packages: --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-libdir=NAME Look for libraries in .../NAME rather than .../lib --with-php-config=PATH Path to php-config php-config - --enable-mermsemr_api_oameye Enable "mermsemr_api_oameye" extension support + --enable-mermsemr_api_sameye Enable "mermsemr_api_sameye" extension support --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use @@ -3986,17 +3986,17 @@ $as_echo "no" >&6; } -php_enable_mermsemr_api_oameye=no +php_enable_mermsemr_api_sameye=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to enable the \"mermsemr_api_oameye\" extension" >&5 -$as_echo_n "checking Whether to enable the \"mermsemr_api_oameye\" extension... " >&6; } -# Check whether --enable-mermsemr_api_oameye was given. -if test "${enable_mermsemr_api_oameye+set}" = set; then : - enableval=$enable_mermsemr_api_oameye; PHP_MERMSEMR_API_OAMEYE=$enableval +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Whether to enable the \"mermsemr_api_sameye\" extension" >&5 +$as_echo_n "checking Whether to enable the \"mermsemr_api_sameye\" extension... " >&6; } +# Check whether --enable-mermsemr_api_sameye was given. +if test "${enable_mermsemr_api_sameye+set}" = set; then : + enableval=$enable_mermsemr_api_sameye; PHP_MERMSEMR_API_SAMEYE=$enableval else - PHP_MERMSEMR_API_OAMEYE=no - test "$PHP_ENABLE_ALL" && PHP_MERMSEMR_API_OAMEYE=$PHP_ENABLE_ALL + PHP_MERMSEMR_API_SAMEYE=no + test "$PHP_ENABLE_ALL" && PHP_MERMSEMR_API_SAMEYE=$PHP_ENABLE_ALL fi @@ -4004,12 +4004,12 @@ fi ext_output="yes, shared" ext_shared=yes -case $PHP_MERMSEMR_API_OAMEYE in +case $PHP_MERMSEMR_API_SAMEYE in shared,*) - PHP_MERMSEMR_API_OAMEYE=`echo "$PHP_MERMSEMR_API_OAMEYE"|$SED 's/^shared,//'` + PHP_MERMSEMR_API_SAMEYE=`echo "$PHP_MERMSEMR_API_SAMEYE"|$SED 's/^shared,//'` ;; shared) - PHP_MERMSEMR_API_OAMEYE=yes + PHP_MERMSEMR_API_SAMEYE=yes ;; no) ext_output=no @@ -4024,7 +4024,7 @@ esac ext_output="yes, shared" ext_shared=yes - test "$PHP_MERMSEMR_API_OAMEYE" = "no" && PHP_MERMSEMR_API_OAMEYE=yes + test "$PHP_MERMSEMR_API_SAMEYE" = "no" && PHP_MERMSEMR_API_SAMEYE=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5 @@ -4033,7 +4033,7 @@ $as_echo "$ext_output" >&6; } -if test $PHP_MERMSEMR_API_OAMEYE != "no"; then +if test $PHP_MERMSEMR_API_SAMEYE != "no"; then if test -z "$php_cxx_done"; then ac_ext=cpp @@ -4440,7 +4440,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi - PHP_VAR_SUBST="$PHP_VAR_SUBST MERMSEMR_API_OAMEYE_SHARED_LIBADD" + PHP_VAR_SUBST="$PHP_VAR_SUBST MERMSEMR_API_SAMEYE_SHARED_LIBADD" @@ -4448,7 +4448,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lstdc++" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lstdc++" else @@ -4499,7 +4499,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="-lpq $MERMSEMR_API_OAMEYE_SHARED_LIBADD" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="-lpq $MERMSEMR_API_SAMEYE_SHARED_LIBADD" if test -n "/usr/lib64"; then if test "/usr/lib64" != "/usr/$PHP_LIBDIR" && test "/usr/lib64" != "/usr/lib"; then @@ -4516,8 +4516,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="-L$ai_p $MERMSEMR_API_OAMEYE_SHARED_LIBADD" - test -n "$ld_runpath_switch" && MERMSEMR_API_OAMEYE_SHARED_LIBADD="$ld_runpath_switch$ai_p $MERMSEMR_API_OAMEYE_SHARED_LIBADD" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="-L$ai_p $MERMSEMR_API_SAMEYE_SHARED_LIBADD" + test -n "$ld_runpath_switch" && MERMSEMR_API_SAMEYE_SHARED_LIBADD="$ld_runpath_switch$ai_p $MERMSEMR_API_SAMEYE_SHARED_LIBADD" else @@ -4599,7 +4599,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lcurl" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lcurl" else @@ -4622,7 +4622,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lconfig++" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lconfig++" else @@ -4645,7 +4645,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -ljson-c" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -ljson-c" else @@ -4668,7 +4668,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lssl" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lssl" else @@ -4691,7 +4691,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lz" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lz" else @@ -4714,7 +4714,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lpcrecpp" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lpcrecpp" else @@ -4737,7 +4737,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu c|c_r|pthread*) ;; *) if test "$ext_shared" = "yes"; then - MERMSEMR_API_OAMEYE_SHARED_LIBADD="$MERMSEMR_API_OAMEYE_SHARED_LIBADD -lgcc_s" + MERMSEMR_API_SAMEYE_SHARED_LIBADD="$MERMSEMR_API_SAMEYE_SHARED_LIBADD -lgcc_s" else @@ -4767,7 +4767,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_extra=`echo "-I@ext_srcdir@/libconfig-1.0.1"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then - PHP_MERMSEMR_API_OAMEYE_SHARED=no + PHP_MERMSEMR_API_SAMEYE_SHARED=no case $ext_dir in @@ -4811,13 +4811,13 @@ EOF done - EXT_STATIC="$EXT_STATIC mermsemr_api_oameye;$ext_dir" + EXT_STATIC="$EXT_STATIC mermsemr_api_sameye;$ext_dir" if test "$ext_shared" != "nocli"; then - EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_oameye;$ext_dir" + EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_sameye;$ext_dir" fi else if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then - PHP_MERMSEMR_API_OAMEYE_SHARED=yes + PHP_MERMSEMR_API_SAMEYE_SHARED=yes case $ext_dir in "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; @@ -4844,7 +4844,7 @@ EOF ac_obj=$1 IFS=$old_IFS - shared_objects_mermsemr_api_oameye="$shared_objects_mermsemr_api_oameye $ac_bdir$ac_obj.lo" + shared_objects_mermsemr_api_sameye="$shared_objects_mermsemr_api_sameye $ac_bdir$ac_obj.lo" case $ac_src in *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; @@ -4870,32 +4870,32 @@ EOF esac if test "x" = "xyes"; then - PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mermsemr_api_oameye.$suffix" + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/mermsemr_api_sameye.$suffix" else - PHP_MODULES="$PHP_MODULES \$(phplibdir)/mermsemr_api_oameye.$suffix" + PHP_MODULES="$PHP_MODULES \$(phplibdir)/mermsemr_api_sameye.$suffix" fi - PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mermsemr_api_oameye" + PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_mermsemr_api_sameye" cat >>Makefile.objects<>confdefs.h <<_ACEOF -#define COMPILE_DL_MERMSEMR_API_OAMEYE 1 +#define COMPILE_DL_MERMSEMR_API_SAMEYE 1 _ACEOF fi fi if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then - PHP_MERMSEMR_API_OAMEYE_SHARED=no + PHP_MERMSEMR_API_SAMEYE_SHARED=no case "$PHP_SAPI" in cgi|embed|phpdbg) @@ -4941,7 +4941,7 @@ EOF done - EXT_STATIC="$EXT_STATIC mermsemr_api_oameye;$ext_dir" + EXT_STATIC="$EXT_STATIC mermsemr_api_sameye;$ext_dir" ;; *) @@ -4989,7 +4989,7 @@ EOF ;; esac - EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_oameye;$ext_dir" + EXT_CLI_STATIC="$EXT_CLI_STATIC mermsemr_api_sameye;$ext_dir" fi @@ -4998,20 +4998,20 @@ EOF if test "$ext_builddir" = "."; then - PHP_PECL_EXTENSION=mermsemr_api_oameye + PHP_PECL_EXTENSION=mermsemr_api_sameye PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" fi - echo "#define MERMSEMR_API_OAMEYE_NS \"mermsemr_api_oameye\"" > include/php_mermsemr_api_oameye_ns.h + echo "#define MERMSEMR_API_SAMEYE_NS \"mermsemr_api_sameye\"" > include/php_mermsemr_api_sameye_ns.h echo "#define MERMSEMR_CONFIG \"`pwd|sed s/src//`etc/\"" > include/php_mermsemr_config.h - echo "#define MERMSEMR_LOG \"`pwd|sed s/src//`logs/mermsemr_api_oameye.log\"" > include/php_mermsemr_log.h + echo "#define MERMSEMR_LOG \"`pwd|sed s/src//`logs/mermsemr_api_sameye.log\"" > include/php_mermsemr_log.h echo "#define TMPL_PREFIX \"`pwd|sed s/src//`email/\"" > include/php_tmpl_prefix.h diff --git a/mermsemr/src/core/mermsemr_api.cc b/mermsemr/src/core/mermsemr_api.cc index b5c1c0a..50d04be 100644 --- a/mermsemr/src/core/mermsemr_api.cc +++ b/mermsemr/src/core/mermsemr_api.cc @@ -242,10 +242,10 @@ static void mermsemr_object_free(zend_object *object) } // ------------------------------------------------------------------ // ------------------------------------------------------------------ -PHP_MINIT_FUNCTION(mermsemr_api_oameye) +PHP_MINIT_FUNCTION(mermsemr_api_sameye) { zend_class_entry ce; - INIT_NS_CLASS_ENTRY(ce, MERMSEMR_API_OAMEYE_NS, "MermsEmr", mermsemr_methods); + INIT_NS_CLASS_ENTRY(ce, MERMSEMR_API_SAMEYE_NS, "MermsEmr", mermsemr_methods); mermsemr_ce = zend_register_internal_class(&ce TSRMLS_CC); mermsemr_ce->create_object = mermsemr_object_new; @@ -266,7 +266,7 @@ PHP_MINIT_FUNCTION(mermsemr_api_oameye) } // ------------------------------------------------------------------ // ------------------------------------------------------------------ -PHP_MINFO_FUNCTION(mermsemr_api_oameye) +PHP_MINFO_FUNCTION(mermsemr_api_sameye) { php_info_print_table_start(); php_info_print_table_row(2, "MERMSEMR API support", "enabled"); @@ -274,31 +274,31 @@ PHP_MINFO_FUNCTION(mermsemr_api_oameye) php_info_print_table_row(2, "Config File", MERMSEMR_CONFIG"mermsemr_api.conf"); php_info_print_table_row(2, "Build Date", __DATE__); php_info_print_table_row(2, "Build Time", __TIME__); - php_info_print_table_row(2, "Namespace", MERMSEMR_API_OAMEYE_NS); - php_info_print_table_row(2, "Version", PHP_MERMSEMR_API_OAMEYE_EXTVER); + php_info_print_table_row(2, "Namespace", MERMSEMR_API_SAMEYE_NS); + php_info_print_table_row(2, "Version", PHP_MERMSEMR_API_SAMEYE_EXTVER); php_info_print_table_end(); } // ------------------------------------------------------------------ // ------------------------------------------------------------------ -zend_module_entry mermsemr_api_oameye_module_entry = { +zend_module_entry mermsemr_api_sameye_module_entry = { #if ZEND_MODULE_API_NO >= 20010901 STANDARD_MODULE_HEADER, #endif - PHP_MERMSEMR_API_OAMEYE_EXTNAME, + PHP_MERMSEMR_API_SAMEYE_EXTNAME, NULL, /* Functions */ - PHP_MINIT(mermsemr_api_oameye), + PHP_MINIT(mermsemr_api_sameye), NULL, /* MSHUTDOWN */ NULL, /* RINIT */ NULL, /* RSHUTDOWN */ - PHP_MINFO(mermsemr_api_oameye), /* MINFO */ + PHP_MINFO(mermsemr_api_sameye), /* MINFO */ #if ZEND_MODULE_API_NO >= 20010901 - PHP_MERMSEMR_API_OAMEYE_EXTVER, + PHP_MERMSEMR_API_SAMEYE_EXTVER, #endif STANDARD_MODULE_PROPERTIES }; -//#ifdef COMPILE_DL_MERMSEMR_API_OAMEYE +//#ifdef COMPILE_DL_MERMSEMR_API_SAMEYE extern "C" { - ZEND_GET_MODULE(mermsemr_api_oameye) + ZEND_GET_MODULE(mermsemr_api_sameye) } //#endif diff --git a/mermsemr/src/include/medTEmails.h b/mermsemr/src/include/medTEmails.h index 01bdac2..5055dec 100644 --- a/mermsemr/src/include/medTEmails.h +++ b/mermsemr/src/include/medTEmails.h @@ -3,6 +3,7 @@ #include "vars.h" +long test_email_calls(long action, CVars in, CVars &out); long member_email_calls(long action, CVars in, CVars &out); long transporter_email_calls(long action, CVars in, CVars &out); long agent_email_calls(long action, CVars in, CVars &out); diff --git a/mermsemr/src/include/mermsemr_api.h b/mermsemr/src/include/mermsemr_api.h index 53a4d7e..70fc29a 100644 --- a/mermsemr/src/include/mermsemr_api.h +++ b/mermsemr/src/include/mermsemr_api.h @@ -71,6 +71,8 @@ enum { #define MODE_SETVALUE 1001 #define MODE_GETVALUE 2002 +#define MERMS_TEST_EMAIL 92015 + // USERS #define MERMS_USER_START 120000 // //-- @@ -91,6 +93,7 @@ enum { // // PROVIDERS #define MERMS_PROVIDERS_START 150000 // // -- +#define MERMS_PROVIDERS_STARTPRACTICE 150005 #define MERMS_PROVIDERS_BEFORESESSION 150010 #define MERMS_PROVIDERS_CREATEACCOUNT 150015 #define MERMS_PROVIDERS_RESETPASSWORD 150020 @@ -108,18 +111,29 @@ enum { #define MERMS_PROVIDERS_END 159999 // - +#define MERMSEMR_BKO_START 100000 +#define MERMSEMR_BKO_LOGIN 100005 +#define MERMSEMR_BKO_CREATEUSER 100010 +#define MERMSEMR_BKO_EDITUSER 100011 +#define MERMSEMR_BKO_UPDATEMEMBER 100012 +#define MERMSEMR_BKO_ADDREASON 100020 +#define MERMSEMR_BKO_DELETEALLCARDS 100022 +#define MERMSEMR_BKO_ADDCARD 100028 +#define MERMSEMR_BKO_LANGUAGE_STATUS 100030 +#define MERMSEMR_BKO_END 119999 -// MEDTRANS BACK OFFICE FUNCTION***************** -#define MEDTRANS_BKO_START 100000 -#define MEDTRANS_BKO_LOGIN 100005 -#define MEDTRANS_BKO_CREATEUSER 100010 -#define MEDTRANS_BKO_EDITUSER 100011 -#define MEDTRANS_BKO_UPDATEMEMBER 100012 -#define MEDTRANS_BKO_ADDREASON 100020 -#define MERMSEMR_BKO_DELETEALLCARDS 100022 -#define MERMSEMR_BKO_ADDCARD 100028 -#define MEDTRANS_BKO_LANGUAGE_STATUS 100030 +// // MEDTRANS BACK OFFICE FUNCTION***************** +// #define MEDTRANS_BKO_START 100000 +// #define MEDTRANS_BKO_LOGIN 100005 +// #define MEDTRANS_BKO_CREATEUSER 100010 +// #define MEDTRANS_BKO_EDITUSER 100011 +// #define MEDTRANS_BKO_UPDATEMEMBER 100012 +// #define MEDTRANS_BKO_ADDREASON 100020 +// #define MERMSEMR_BKO_DELETEALLCARDS 100022 +// #define MERMSEMR_BKO_ADDCARD 100028 +// #define MEDTRANS_BKO_LANGUAGE_STATUS 100030 + + @@ -362,17 +376,17 @@ enum { #define MERMSEMR_CREATE_ACCOUNT 320 //************************************************************** -#define MERMSEMR_BKO_START 10000 +// #define MERMSEMR_BKO_START 10000 -#define MERMSEMR_BKO_LOGIN 10010 -#define MERMSEMR_BKO_CREATEUSER 10015 -#define MERMSEMR_BKO_UPDATEUSER 10020 +// #define MERMSEMR_BKO_LOGIN 10010 +// #define MERMSEMR_BKO_CREATEUSER 10015 +// #define MERMSEMR_BKO_UPDATEUSER 10020 -#define MERMSEMR_BKO_MEMBERADD 100025 -#define MERMSEMR_BKO_MEMBERUPDT 100026 +// #define MERMSEMR_BKO_MEMBERADD 100025 +// #define MERMSEMR_BKO_MEMBERUPDT 100026 -#define MERMSEMR_BKO_END 10999 +// #define MERMSEMR_BKO_END 10999 //************************************************************** #define MERMSEMR_ACCOUNT_START 11000 diff --git a/mermsemr/src/include/php_mermsemr_api.h b/mermsemr/src/include/php_mermsemr_api.h index 79bb443..8a3a1f5 100644 --- a/mermsemr/src/include/php_mermsemr_api.h +++ b/mermsemr/src/include/php_mermsemr_api.h @@ -1,8 +1,8 @@ -#ifndef PHP_MERMSEMR_API_OAMEYE_H -#define PHP_MERMSEMR_API_OAMEYE_H +#ifndef PHP_MERMSEMR_API_SAMEYE_H +#define PHP_MERMSEMR_API_SAMEYE_H -#define PHP_MERMSEMR_API_OAMEYE_EXTNAME "mermsemr_api_oameye" -#define PHP_MERMSEMR_API_OAMEYE_EXTVER "0.1" +#define PHP_MERMSEMR_API_SAMEYE_EXTNAME "mermsemr_api_sameye" +#define PHP_MERMSEMR_API_SAMEYE_EXTVER "0.1" #ifdef HAVE_CONFIG_H #include "config.h" @@ -12,8 +12,8 @@ extern "C" { #include "php.h" } -extern zend_module_entry mermsemr_api_oameye_module_entry; -#define mermsemr_api_oameye_module_ptr &mermsemr_api_oameye_module_entry -#define phpext_mermsemr_api_oameye_ptr mermsemr_api_oameye_module_ptr +extern zend_module_entry mermsemr_api_sameye_module_entry; +#define mermsemr_api_sameye_module_ptr &mermsemr_api_sameye_module_entry +#define phpext_mermsemr_api_sameye_ptr mermsemr_api_sameye_module_ptr -#endif /* PHP_MERMSEMR_API_OAMEYE_H */ +#endif /* PHP_MERMSEMR_API_SAMEYE_H */ diff --git a/mermsemr/src/include/php_mermsemr_api_ns.h b/mermsemr/src/include/php_mermsemr_api_ns.h index 69ad1a8..a7c836b 100644 --- a/mermsemr/src/include/php_mermsemr_api_ns.h +++ b/mermsemr/src/include/php_mermsemr_api_ns.h @@ -1 +1 @@ -#define MERMSEMR_API_OAMEYE_NS "mermsemr_api_oameye" +#define MERMSEMR_API_SAMEYE_NS "mermsemr_api_sameye" diff --git a/mermsemr/src/libtool b/mermsemr/src/libtool index ec45ed1..88c395b 100755 --- a/mermsemr/src/libtool +++ b/mermsemr/src/libtool @@ -1,6 +1,6 @@ #! /bin/sh # Generated automatically by config.status () -# Libtool was configured on host localhost.localdomain: +# Libtool was configured on host merms-ehr-dev: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -285,7 +285,7 @@ hardcode_into_libs=yes sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/8 /usr/lib64 /lib64 /usr/lib /lib " # Detected run-time system search path for libraries. -sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64//bind9-export/ /usr/lib64/dyninst " +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64//bind9-export/ /usr/lib64/dyninst " # Explicit LT_SYS_LIBRARY_PATH set during ./configure time. configure_time_lt_sys_library_path="" diff --git a/mermsemr/src/mailsend/Makefile b/mermsemr/src/mailsend/Makefile index 1133cf3..20e738b 100644 --- a/mermsemr/src/mailsend/Makefile +++ b/mermsemr/src/mailsend/Makefile @@ -6,7 +6,7 @@ srcdir = . top_srcdir = . CC= gcc -DEFS= -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_CTYPE_H=1 -DHAVE_STDINT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_LIMITS_H=1 -DHAVE_FLOCK=1 -DHAVE_SOCKET=1 -DHAVE_HTONL=1 -DHAVE_GETHOSTNAME=1 -DHAVE_GETHOSTBYADDR=1 -DHAVE_RES_SEARCH=1 -DHAVE_LIBRESOLV=1 -DHAVE_INET_ATON=1 -DHAVE_DN_SKIPNAME=1 -DHAVE_MKSTEMP=1 -DHAVE_GETADDRINFO=1 -DUNIX +DEFS= -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_CTYPE_H=1 -DHAVE_STDINT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_LIMITS_H=1 -DHAVE_FLOCK=1 -DHAVE_SOCKET=1 -DHAVE_HTONL=1 -DHAVE_GETHOSTNAME=1 -DHAVE_GETHOSTBYADDR=1 -DHAVE_RES_SEARCH=1 -DHAVE_LIBRESOLV=1 -DHAVE_INET_ATON=1 -DHAVE_DN_SKIPNAME=1 -DHAVE_MKSTEMP=1 -DHAVE_GETADDRINFO=1 -DHAVE_OPENSSL=1 -DUNIX PROGNAME= mailsend INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} @@ -35,9 +35,9 @@ MUTILS_LIB= ./libs/libmutils/libmutils.a MSOCK_LIB=./libs/libmsock/libmsock.a SLL_LIB= ./libs/libsll/libsll.a -OPENSSL_DIR= -OPENSSL_INC= -OPENSSL_LIBS= +OPENSSL_DIR=/usr/ +OPENSSL_INC=-I/usr//include +OPENSSL_LIBS=-L/usr//lib -lssl -lcrypto STRIP=/usr/bin/strip @@ -47,7 +47,7 @@ DEFINES= $(INCLUDES) $(DEFS) -DHAVE_STRING_H=1 -DHAVE_STDLIB_H=1 \ -DHAVE_MATH_H=1 CFLAGS= -g -O2 -Wall $(DEFINES) -LIBS=$(MSOCK_LIB) $(SLL_LIB) $(MUTILS_LIB) $(OPENSSL_LIBS) -lresolv +LIBS=$(MSOCK_LIB) $(SLL_LIB) $(MUTILS_LIB) $(OPENSSL_LIBS) -lresolv -L/usr//lib -lssl -lcrypto -ldl SRCS = main.c smtp.c utils.c setget.c examples.c OBJS = main.o smtp.o utils.o setget.o examples.o diff --git a/mermsemr/src/mailsend/libs/libmsock/Makefile b/mermsemr/src/mailsend/libs/libmsock/Makefile index c2163d4..7b9fcaa 100644 --- a/mermsemr/src/mailsend/libs/libmsock/Makefile +++ b/mermsemr/src/mailsend/libs/libmsock/Makefile @@ -3,14 +3,14 @@ # genmake 1.0 by ma_muquit@fccc.edu, RCS ## CC= gcc -DEFS= -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_CTYPE_H=1 -DHAVE_STDINT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_LIMITS_H=1 -DHAVE_FLOCK=1 -DHAVE_SOCKET=1 -DHAVE_HTONL=1 -DHAVE_GETHOSTNAME=1 -DHAVE_GETHOSTBYADDR=1 -DHAVE_RES_SEARCH=1 -DHAVE_LIBRESOLV=1 -DHAVE_INET_ATON=1 -DHAVE_DN_SKIPNAME=1 -DHAVE_MKSTEMP=1 -DHAVE_GETADDRINFO=1 +DEFS= -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_CTYPE_H=1 -DHAVE_STDINT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_LIMITS_H=1 -DHAVE_FLOCK=1 -DHAVE_SOCKET=1 -DHAVE_HTONL=1 -DHAVE_GETHOSTNAME=1 -DHAVE_GETHOSTBYADDR=1 -DHAVE_RES_SEARCH=1 -DHAVE_LIBRESOLV=1 -DHAVE_INET_ATON=1 -DHAVE_DN_SKIPNAME=1 -DHAVE_MKSTEMP=1 -DHAVE_GETADDRINFO=1 -DHAVE_OPENSSL=1 AR= ar cq RANLIB= ranlib LIBNAME= libmsock.a -OPENSSL_DIR= -OPENSSL_INC= -OPENSSL_LIBS= +OPENSSL_DIR=/usr/ +OPENSSL_INC=-I/usr//include +OPENSSL_LIBS=-L/usr//lib -lssl -lcrypto INCLUDES= -I. $(OPENSSL_INC) diff --git a/mermsemr/src/mailsend/libs/libmutils/Makefile b/mermsemr/src/mailsend/libs/libmutils/Makefile index 84a4eb1..b593297 100644 --- a/mermsemr/src/mailsend/libs/libmutils/Makefile +++ b/mermsemr/src/mailsend/libs/libmutils/Makefile @@ -1,14 +1,14 @@ # jul-29-1999 CC= gcc -DEFS= -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_CTYPE_H=1 -DHAVE_STDINT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_LIMITS_H=1 -DHAVE_FLOCK=1 -DHAVE_SOCKET=1 -DHAVE_HTONL=1 -DHAVE_GETHOSTNAME=1 -DHAVE_GETHOSTBYADDR=1 -DHAVE_RES_SEARCH=1 -DHAVE_LIBRESOLV=1 -DHAVE_INET_ATON=1 -DHAVE_DN_SKIPNAME=1 -DHAVE_MKSTEMP=1 -DHAVE_GETADDRINFO=1 +DEFS= -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_CTYPE_H=1 -DHAVE_STDINT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_LIMITS_H=1 -DHAVE_FLOCK=1 -DHAVE_SOCKET=1 -DHAVE_HTONL=1 -DHAVE_GETHOSTNAME=1 -DHAVE_GETHOSTBYADDR=1 -DHAVE_RES_SEARCH=1 -DHAVE_LIBRESOLV=1 -DHAVE_INET_ATON=1 -DHAVE_DN_SKIPNAME=1 -DHAVE_MKSTEMP=1 -DHAVE_GETADDRINFO=1 -DHAVE_OPENSSL=1 AR= ar cq RANLIB= ranlib LIBNAME= libmutils.a -OPENSSL_DIR= -OPENSSL_INC= -OPENSSL_LIBS= +OPENSSL_DIR=/usr/ +OPENSSL_INC=-I/usr//include +OPENSSL_LIBS=-L/usr//lib -lssl -lcrypto INCLUDES= -I. $(OPENSSL_INC) diff --git a/mermsemr/src/mailsend/libs/libsll/Makefile b/mermsemr/src/mailsend/libs/libsll/Makefile index 4039534..071cfd7 100644 --- a/mermsemr/src/mailsend/libs/libsll/Makefile +++ b/mermsemr/src/mailsend/libs/libsll/Makefile @@ -4,7 +4,7 @@ # Aug-07-1998 # CC= gcc -DEFS= -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_CTYPE_H=1 -DHAVE_STDINT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_LIMITS_H=1 -DHAVE_FLOCK=1 -DHAVE_SOCKET=1 -DHAVE_HTONL=1 -DHAVE_GETHOSTNAME=1 -DHAVE_GETHOSTBYADDR=1 -DHAVE_RES_SEARCH=1 -DHAVE_LIBRESOLV=1 -DHAVE_INET_ATON=1 -DHAVE_DN_SKIPNAME=1 -DHAVE_MKSTEMP=1 -DHAVE_GETADDRINFO=1 +DEFS= -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STRING_H=1 -DHAVE_STRINGS_H=1 -DHAVE_MEMORY_H=1 -DHAVE_MALLOC_H=1 -DHAVE_UNISTD_H=1 -DHAVE_CTYPE_H=1 -DHAVE_STDINT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_FILE_H=1 -DHAVE_LIMITS_H=1 -DHAVE_FLOCK=1 -DHAVE_SOCKET=1 -DHAVE_HTONL=1 -DHAVE_GETHOSTNAME=1 -DHAVE_GETHOSTBYADDR=1 -DHAVE_RES_SEARCH=1 -DHAVE_LIBRESOLV=1 -DHAVE_INET_ATON=1 -DHAVE_DN_SKIPNAME=1 -DHAVE_MKSTEMP=1 -DHAVE_GETADDRINFO=1 -DHAVE_OPENSSL=1 AR= ar cq RANLIB= ranlib LIBNAME= libsll.a diff --git a/mermsemr/src/shared_tool/function_backoffice.cc b/mermsemr/src/shared_tool/function_backoffice.cc index d0ca45a..bde2c5b 100644 --- a/mermsemr/src/shared_tool/function_backoffice.cc +++ b/mermsemr/src/shared_tool/function_backoffice.cc @@ -28,7 +28,7 @@ long LoginBkoAdmin(CVars in, CVars &out) { in["sessionid"].set_valid(true); - ret = load_db_record(out, "SELECT *,id AS backoffice_id FROM bko_users WHERE status=1 AND LOWER(username)=LOWER('%s') AND password= md5('%s')", in["username"].c_str(), in["password"].c_str()); + ret = load_db_record(out, "SELECT *,id AS backoffice_id FROM bko_users WHERE status=1 AND LOWER(username)=LOWER('%s') AND pass= md5('%s')", in["username"].c_str(), in["password"].c_str()); if (ret > 0) { if (BkoCommonSessionCheck(out["id"].Long(), 0, 0, in["sessionid"].c_str(), 1) > 0) { out["stauts"] = "OK"; diff --git a/mermsemr/src/shared_tool/medTEmails.cc b/mermsemr/src/shared_tool/medTEmails.cc index b8d843e..7ea0cec 100644 --- a/mermsemr/src/shared_tool/medTEmails.cc +++ b/mermsemr/src/shared_tool/medTEmails.cc @@ -29,6 +29,44 @@ long getMemberInvoiceID( long rid ){ return 0; } */ + +long test_email_calls(long action, CVars in, CVars &out) { + logfmt(logINFO, "test_email_calls()"); + out["result"] = "ECHO BACKEND"; + + CVars x, y, z, x1, x2; + long ret = 0; + const char * loc = getenv("REMOTE_ADDR"); + C_CGI_Form form("", ""); + // form.LetStr("subject", "myFit by MERMS Email Test"); + form.LetStr("site_name", "myFit by MERMS"); + form.LetStr("contactus", "https://myFit.mermsemr.com/"); + + + + if (load_db_record(x, "SELECT *,email as email2,now() AS last_login2 FROM members WHERE id = %lu ", in["member_id"].Long())) { + vars2form(x, form); + form.LetStr("subject", "Welcome to myFit by MERMS "); + form.LetStr("email", x["email2"].c_str()); + form.Email("test_email.mailfile"); + + // alert_email_calls(MERMS_USER_CREATEACCOUNT, in, out); + + } + + if (load_db_record(x, "SELECT *,email as email2,now() AS last_login2 FROM members WHERE id = %lu ", in["member_id"].Long())) { + vars2form(x, form); + form.LetStr("subject", "Welcome to myFit by MERMS "); + form.LetStr("email", x["email2"].c_str()); + form.Email("USERS/user_welcome.mailfile"); + + // alert_email_calls(MERMS_USER_CREATEACCOUNT, in, out); + + } + +return 0; +} + long member_email_calls(long action, CVars in, CVars &out) { logfmt(logINFO, "member_email_calls()"); out["result"] = "ECHO BACKEND"; @@ -270,48 +308,19 @@ long provider_email_calls(long action, CVars in, CVars &out) { // form.LetStr("subject", "myFit by MERMS Email Test"); char vname[100]; - form.LetStr("site_name", "myFit by MERMS"); - form.LetStr("agent_site", "https://agent.medtransgo.com/"); + // form.LetStr("site_name", "myFit by MERMS"); + // form.LetStr("agent_site", "https://agent.medtransgo.com/"); logfmt(logINFO, "@@@@@@->AMEYE-1)"); switch (action) { - case MEDTRANS_TRANSP_ASSIGNTRANSPORT: - - if (load_db_record(x, "SELECT m.id AS member_id, a.agent_name,s.provider,s.quantity," - " TO_CHAR(s.service_date :: TIMESTAMP, 'Day Mon dd, yyyy HH:MI AM') AS long_date," - " a.street AS to_street,a.city AS to_city,a.state AS to_state,a.zipcode AS to_zipcode,a.phone AS to_phone," - " m.firstname,m.lastname,m.email AS member_email " - " FROM members_service_request s " - " LEFT JOIN agents a ON a.id=s.agent_id " - " LEFT JOIN members m ON m.id=s.member_id " - " WHERE s.id=%lu", in["service_id"].Long()) > 0) { - vars2form(x, form); - load_db_record(y, "SELECT email AS req_email,firstname AS cus_firstname,lastname AS cus_lastname ,phone as cus_phone FROM members WHERE id = %lu ", x["member_id"].Long()); + case MERMS_PROVIDERS_STARTPRACTICE: + load_db_record(y, "SELECT * FROM practice_pending WHERE id = %lu ", in["practice_pending_id"].Long()); vars2form(y, form); - - - load_db_record(q, "SELECT street1 AS from_street, street2 AS from_street2, city AS from_city, zipcode AS from_zipcode , state AS from_state, country AS from_country " - "FROM members_profile WHERE member_id =%lu", x["member_id"].Long()); - vars2form(q, form); - - if (x["provider"] != "" && x["provider"].Long() > 0) { - // - load_db_record(z, "SELECT d.firstname AS driver_firstname,d.lastname AS driver_lastname,d.email AS driver_email FROM providers d WHERE d.id = %lu ", x["provider"].Long()); - vars2form(z, form); - logfmt(logINFO, "@@@@@@->AMEYE-101)"); - form.LetStr("confirm_link", in["service_id"].c_str()); - logfmt(logINFO, "@@@@@@->AMEYE-102)"); - form.LetStr("server_link", "https://www.myFit by MERMS.co//provider/processRequest?reqId="); - logfmt(logINFO, "@@@@@@->AMEYE-103)"); - form.LetStr("subject", "Laundry Pickup Assigned"); - form.LetStr("email", z["driver_email"].c_str()); - form.Email("PROVIDERS/pickup_assigned.mailfile"); - logfmt(logINFO, "@@@@@@->AMEYE-104)"); - } - } - - break; + form.LetStr("subject", "Welcome to MERMS"); + form.LetStr("email", y["email"].c_str()); + form.Email("PROVIDERS/start_practice.mailfile"); + break; } diff --git a/mermsemr/src/shared_tool/medTrBackOffice.cc b/mermsemr/src/shared_tool/medTrBackOffice.cc index c1f60f2..6538d29 100644 --- a/mermsemr/src/shared_tool/medTrBackOffice.cc +++ b/mermsemr/src/shared_tool/medTrBackOffice.cc @@ -1,6 +1,6 @@ /* General Header -ChiefSoft Jan 2019 +ChiefSoft Jan 2020 */ #include "clog.h" #include "cgi.h" @@ -21,6 +21,19 @@ Other Headers #include "function_members.h" #include "creditcards.h" + +#define MERMSEMR_BKO_START 100000 +#define MERMSEMR_BKO_LOGIN 100005 +#define MERMSEMR_BKO_CREATEUSER 100010 +#define MERMSEMR_BKO_EDITUSER 100011 +#define MERMSEMR_BKO_UPDATEMEMBER 100012 +#define MERMSEMR_BKO_ADDREASON 100020 +#define MERMSEMR_BKO_DELETEALLCARDS 100022 +#define MERMSEMR_BKO_ADDCARD 100028 +#define MERMSEMR_BKO_LANGUAGE_STATUS 100030 + + + long backoffice_calls(CVars in, CVars &out) { logfmt(logINFO, "backoffice_calls()"); out["result"] = "YES I GET TO BACK END"; @@ -31,18 +44,14 @@ long backoffice_calls(CVars in, CVars &out) { switch (action) { - case MEDTRANS_BKO_LOGIN: + case MERMSEMR_BKO_LOGIN: return LoginBkoAdmin(in, out); break; - case MEDTRANS_BKO_CREATEUSER: + case MERMSEMR_BKO_CREATEUSER: return createBkoAdmin(in, out); break; - case MERMSEMR_ACCOUNT_PENDING: - - break; - case MERMSEMR_BKO_DELETEALLCARDS: return DeletAallCards(in, out); break; diff --git a/mermsemr/src/shared_tool/mermsemr_api_main.cc b/mermsemr/src/shared_tool/mermsemr_api_main.cc index 466e858..dcafd36 100644 --- a/mermsemr/src/shared_tool/mermsemr_api_main.cc +++ b/mermsemr/src/shared_tool/mermsemr_api_main.cc @@ -1,5 +1,5 @@ /* -main entry point for API calls Chiefsoft July 2017 */ +main entry point for API calls Chiefsoft July 2020 */ #include "mermsemr_api_main.h" #include "mermsemr_api.h" #include "clog.h" @@ -23,6 +23,12 @@ long mermsemr_api_main(CVars in, CVars &out) { //REQ_LONG( in, "pid", 0, -1); // global implementation - who is calling try { + if ( action == MERMS_TEST_EMAIL ){ + logfmt(logINFO, "long MERMSEMR_BKO_START(CVars in, CVars &out)-> JUST A TEST EMAIL *******************************************"); + return test_email_calls( action, in, out); + + } + if (action >= MERMS_USER_START && action <= MERMS_USER_END) { return members_call(in, out); } @@ -31,7 +37,11 @@ long mermsemr_api_main(CVars in, CVars &out) { return providers_call(in, out); } - + if (action >= MERMSEMR_BKO_START && action <= MERMSEMR_BKO_END) { + logfmt(logINFO, "long MERMSEMR_BKO_START(CVars in, CVars &out)*******************************************"); + return backoffice_calls(in, out); + } + } catch (bad_parameter) { logfmt(logINFO, "ERROR CALL long mermsemr_api_main(CVars in, CVars &out)"); diff --git a/mermsemr/src/shared_tool/providers.cc b/mermsemr/src/shared_tool/providers.cc index e8d1ed8..4a9783a 100644 --- a/mermsemr/src/shared_tool/providers.cc +++ b/mermsemr/src/shared_tool/providers.cc @@ -15,6 +15,7 @@ #include "providers.h" #include "function_members.h" #include "function_providers_charts.h" +#include "medTEmails.h" long provider_login(CVars in, CVars &out); long PracticeLogin(CVars in, CVars &out); @@ -23,6 +24,7 @@ long provider_createmember(CVars in, CVars &out); long provider_acceptmember(CVars in, CVars &out); long provider_linkIdemember(CVars in, CVars &out); void GenerateLongID(char * number, int sz, int seed); +long provider_startNewPractice(CVars in, CVars &out); long providers_call(CVars in, CVars &out) { long ret = PHP_API_BAD_PARAM; @@ -34,21 +36,26 @@ long providers_call(CVars in, CVars &out) { switch (in["action"].Long()) { case MERMS_PROVIDERS_LOGIN: - return provider_login(in, out); + return provider_login(in, out); break; case MERMS_PROVIDERS_CREATEMEMBER: - return provider_createmember(in, out); + return provider_createmember(in, out); break; - case MERMS_PROVIDERS_CREATECHART: - // create chart from provider side now - return provider_chart(in, out); + + case MERMS_PROVIDERS_STARTPRACTICE: + return provider_startNewPractice(in, out); break; - + + case MERMS_PROVIDERS_CREATECHART: + // create chart from provider side now + return provider_chart(in, out); + break; + case MERMS_PROVIDERS_LINKMEMBER: - return provider_linkIdemember(in, out); + return provider_linkIdemember(in, out); break; - + case EXISTING_CARD: REQ_LONG(in, "paymentid", 0, -1); // now we have to make sure the payment id is valid for this customer @@ -73,22 +80,20 @@ long providers_call(CVars in, CVars &out) { return ret; } - - long provider_login(CVars in, CVars &out) { long ret = -1; -try{ - REQ_STRING(in, "username", 2, 49, "(.*)"); - REQ_STRING(in, "pass", 2, 49, "(.*)"); + try { + REQ_STRING(in, "username", 2, 49, "(.*)"); + REQ_STRING(in, "pass", 2, 49, "(.*)"); - - if ( load_db_record(out, "SELECT p.name AS practice_name,u.*,u.id AS user_id FROM practice_users u LEFT JOIN practice p ON p.id = u.practice_id WHERE u.id = 1 ") > 0 ){ - ret = PracticeLogin( in, out ); - } - - -} catch (bad_parameter) { + + if (load_db_record(out, "SELECT p.name AS practice_name,u.*,u.id AS user_id FROM practice_users u LEFT JOIN practice p ON p.id = u.practice_id WHERE u.id = 1 ") > 0) { + ret = PracticeLogin(in, out); + } + + + } catch (bad_parameter) { logfmt(logINFO, "ERROR CALL long provider_login(CVars in, CVars &out)"); } return ret; @@ -150,124 +155,184 @@ long provider_linkIdemember(CVars in, CVars &out) { } - -long provider_createmember(CVars in, CVars &out){ +long provider_startNewPractice(CVars in, CVars &out) { + + long ret = PHP_API_BAD_PARAM; + logfmt(logINFO, "provider_startNewPractice()"); + + try { + + // REQ_LONG(in, "practice_id", 0, -1); + // REQ_LONG(in, "practice_user_id", 0, -1); + REQ_STRING(in, "practice_name", 5, 49, "(.*)"); + REQ_STRING(in, "username", 5, 49, "(.*)"); + REQ_STRING(in, "firstname", 2, 49, "(.*)"); + REQ_STRING(in, "lastname", 2, 49, "(.*)"); + OPTIONAL(in, "phone") REQ_STRING(in, "phone", 5, 23, "(.*)"); + REQ_STRING(in, "password", 5, 49, "(.*)"); + + long member_id = 0; + + //REQ_STRING (in, "sessionid", 4, 40, "(.*)"); + const char * loc = getenv("REMOTE_ADDR"); + out["member_id"] = "0"; + + ret = load_db_record(out, "SELECT *,id AS practice_pending_id FROM practice_pending WHERE LOWER(username)=LOWER('%s') ", in["username"].c_str()); + logfmt(logINFO, "provider_startNewPractice()practice_pending_id=%lu", out["practice_pending_id"].Long()); + if (out["practice_pending_id"].Long() == 0) { + + // LETS CREATE THE ACOUNT NOW + CVars x; + const char * loc = getenv("REMOTE_ADDR"); + x["loc"] = loc; + x["loc"].set_valid(true); + x["username"] = in["username"]; + x["username"].set_valid(true); + x["firstname"] = in["firstname"]; + x["firstname"].set_valid(true); + x["lastname"] = in["lastname"]; + x["lastname"].set_valid(true); + + x["email"] = in["email"]; + x["email"].set_valid(true); + + x["practice_name"] = in["practice_name"]; + x["practice_name"].set_valid(true); + + out["practice_pending_id"] = insert_db_record(DBS_VALID, "practice_pending", "practice_pending_id_seq", x); + + if (out["practice_pending_id"].Long() > 0) { + + // Now Send Email + ret = PHP_API_OK; + //make your patient + provider_email_calls(MERMS_PROVIDERS_STARTPRACTICE, out, out); + // ============== + } + } // if username + } catch (bad_parameter) { + logfmt(logINFO, "ERROR CALL provider_startNewPractice"); + } + logfmt(logINFO, "/provider_startNewPractice()"); + return ret; +} + + +long provider_createmember(CVars in, CVars &out) { long ret = PHP_API_BAD_PARAM; logfmt(logINFO, "Provider CreateMember()"); try { - REQ_LONG(in, "practice_id", 0, -1); - REQ_LONG(in, "practice_user_id", 0, -1); - REQ_STRING(in, "username", 5, 49, "(.*)"); - REQ_STRING(in, "firstname", 2, 49, "(.*)"); - REQ_STRING(in, "lastname", 2, 49, "(.*)"); - OPTIONAL(in, "phone") REQ_STRING(in, "phone", 5, 23, "(.*)"); - REQ_STRING(in, "password", 5, 49, "(.*)"); - OPTIONAL(in, "phone") REQ_STRING(in, "loc", 5, 16, "(.*)"); - OPTIONAL(in, "login") REQ_LONG(in, "login", 0, -1); + REQ_LONG(in, "practice_id", 0, -1); + REQ_LONG(in, "practice_user_id", 0, -1); + REQ_STRING(in, "username", 5, 49, "(.*)"); + REQ_STRING(in, "firstname", 2, 49, "(.*)"); + REQ_STRING(in, "lastname", 2, 49, "(.*)"); + OPTIONAL(in, "phone") REQ_STRING(in, "phone", 5, 23, "(.*)"); + REQ_STRING(in, "password", 5, 49, "(.*)"); + OPTIONAL(in, "phone") REQ_STRING(in, "loc", 5, 16, "(.*)"); + OPTIONAL(in, "login") REQ_LONG(in, "login", 0, -1); - long member_id = 0; + long member_id = 0; - //REQ_STRING (in, "sessionid", 4, 40, "(.*)"); - const char * loc = getenv("REMOTE_ADDR"); - out["member_id"]="0"; - - ret = load_db_record(out, "SELECT *,id AS member_id FROM members WHERE LOWER(username)=LOWER('%s') ", in["username"].c_str()); - logfmt(logINFO, "Provider CreateMember()member_id=%lu",out["member_id"].Long()); - if (out["member_id"].Long() == 0) { - - // LETS CREATE THE ACOUNT NOW - CVars x; + //REQ_STRING (in, "sessionid", 4, 40, "(.*)"); const char * loc = getenv("REMOTE_ADDR"); - x["loc"] = loc; - x["loc"].set_valid(true); - x["username"] = in["username"]; - x["username"].set_valid(true); - x["firstname"] = in["firstname"]; - x["firstname"].set_valid(true); - x["lastname"] = in["lastname"]; - x["lastname"].set_valid(true); - x["phone"] = in["phone"]; - x["phone"].set_valid(true); - // x["loc"] = in["loc"]; - // x["loc"].set_valid(true); - x["email"] = in["email"]; - x["email"].set_valid(true); - // x["password"] = in["email"]; - // x["password"].set_valid(true); - out["member_id"] = insert_db_record(DBS_VALID, "members", "members_id_seq", x); - - if (out["member_id"].Long() > 0) { - pgsql_query("UPDATE members SET password = md5('%s') WHERE id = %lu", in["password"].c_str(), out["member_id"].Long()); // setting the password MD5 now - // Now Send Email - ret = PHP_API_OK; - //make your patient - CVars z; - z["practice_id"] = in["practice_id"]; - z["practice_id"].set_valid(true); - z["practice_user_id"] = in["practice_user_id"]; - z["practice_user_id"].set_valid(true); - z["member_id"] = out["member_id"]; - z["member_id"].set_valid(true); - provider_acceptmember(z, out); + out["member_id"] = "0"; - out["status"] = "OK"; - member_id = out["member_id"].Long(); - in["member_id"] = out["member_id"]; - in["member_id"].set_valid(true); - medTrUpdateProfile(in, out); + ret = load_db_record(out, "SELECT *,id AS member_id FROM members WHERE LOWER(username)=LOWER('%s') ", in["username"].c_str()); + logfmt(logINFO, "Provider CreateMember()member_id=%lu", out["member_id"].Long()); + if (out["member_id"].Long() == 0) { - // ============== - } - } // if username - }catch (bad_parameter) { + // LETS CREATE THE ACOUNT NOW + CVars x; + const char * loc = getenv("REMOTE_ADDR"); + x["loc"] = loc; + x["loc"].set_valid(true); + x["username"] = in["username"]; + x["username"].set_valid(true); + x["firstname"] = in["firstname"]; + x["firstname"].set_valid(true); + x["lastname"] = in["lastname"]; + x["lastname"].set_valid(true); + x["phone"] = in["phone"]; + x["phone"].set_valid(true); + // x["loc"] = in["loc"]; + // x["loc"].set_valid(true); + x["email"] = in["email"]; + x["email"].set_valid(true); + // x["password"] = in["email"]; + // x["password"].set_valid(true); + out["member_id"] = insert_db_record(DBS_VALID, "members", "members_id_seq", x); + + if (out["member_id"].Long() > 0) { + pgsql_query("UPDATE members SET password = md5('%s') WHERE id = %lu", in["password"].c_str(), out["member_id"].Long()); // setting the password MD5 now + // Now Send Email + ret = PHP_API_OK; + //make your patient + CVars z; + z["practice_id"] = in["practice_id"]; + z["practice_id"].set_valid(true); + z["practice_user_id"] = in["practice_user_id"]; + z["practice_user_id"].set_valid(true); + z["member_id"] = out["member_id"]; + z["member_id"].set_valid(true); + provider_acceptmember(z, out); + + out["status"] = "OK"; + member_id = out["member_id"].Long(); + in["member_id"] = out["member_id"]; + in["member_id"].set_valid(true); + medTrUpdateProfile(in, out); + + // ============== + } + } // if username + } catch (bad_parameter) { logfmt(logINFO, "ERROR CALL Provider CreateMember"); } logfmt(logINFO, "/Provider CreateMember()"); return ret; } - -long provider_acceptmember(CVars in, CVars &out){ +long provider_acceptmember(CVars in, CVars &out) { long ret = PHP_API_BAD_PARAM; logfmt(logINFO, "provider_acceptmember()"); - char vname[15]; - try{ - - REQ_LONG(in, "practice_id", 0, -1); - REQ_LONG(in, "practice_user_id", 0, -1); - REQ_LONG(in, "member_id", 0, -1); - - GenerateLongID(vname, sizeof (vname), 10); - //snprintf(vname, sizeof (vname), "ME%05d", i); + char vname[15]; + try { + + REQ_LONG(in, "practice_id", 0, -1); + REQ_LONG(in, "practice_user_id", 0, -1); + REQ_LONG(in, "member_id", 0, -1); + + GenerateLongID(vname, sizeof (vname), 10); + //snprintf(vname, sizeof (vname), "ME%05d", i); out["long_id"] = vname; - - - - CVars x; - x["practice_id"] = in["practice_id"]; - x["practice_id"].set_valid(true); - x["practice_user_id"] = in["practice_user_id"]; - x["practice_user_id"].set_valid(true); - x["member_id"] = in["member_id"]; - x["member_id"].set_valid(true); - + + + + CVars x; + x["practice_id"] = in["practice_id"]; + x["practice_id"].set_valid(true); + x["practice_user_id"] = in["practice_user_id"]; + x["practice_user_id"].set_valid(true); + x["member_id"] = in["member_id"]; + x["member_id"].set_valid(true); + x["long_id"] = vname; - x["long_id"].set_valid(true); + x["long_id"].set_valid(true); out["patient_id"] = insert_db_record(DBS_VALID, "patients", "patients_id_seq", x); - - - - }catch (bad_parameter) { + + + + } catch (bad_parameter) { logfmt(logINFO, "ERROR CALL Provider CreateMember"); } logfmt(logINFO, "/provider_acceptmember()"); - return ret; + return ret; } - void GenerateLongID(char * number, int sz, int seed) { char chars[] = "WRB01234WRB56789WRB"; int n = sizeof (chars); @@ -291,9 +356,10 @@ void GenerateLongID(char * number, int sz, int seed) { } number[i] = 0; } - + //XXX + long PracticeLogin(CVars in, CVars &out) { long ret = PHP_API_BAD_PARAM; @@ -307,7 +373,7 @@ long PracticeLogin(CVars in, CVars &out) { // remove all existing session pgsql_exec("DELETE FROM practice_users_session WHERE practice_users_id=%ld ", out["practice_users_id"].Long()); // Create New Session Now - if (PracticeSessionCheck(out["practice_id"].Long(), out["practice_users_id"].Long(),out["sessionid"].c_str(), 1) > 0) { + if (PracticeSessionCheck(out["practice_id"].Long(), out["practice_users_id"].Long(), out["sessionid"].c_str(), 1) > 0) { out["stauts"] = "OK"; /*LOAD THE SESSION INTO OUT now */ @@ -331,7 +397,6 @@ long PracticeLogin(CVars in, CVars &out) { return ret; } - long PracticeSessionCheck(long practice_id, long practice_users_id, const char *sessionid, int create) { logfmt(logINFO, "long PracticeSessionCheck(long uid, const char *sessionid, int create )"); // Sanity check @@ -367,7 +432,7 @@ long PracticeSessionCheck(long practice_id, long practice_users_id, const char * } } - + if (create > 0) { // Check session i? @@ -384,7 +449,7 @@ long PracticeSessionCheck(long practice_id, long practice_users_id, const char * const char * loc = getenv("REMOTE_ADDR"); sess["loc"] = loc; sess["loc"].set_valid(true); - sess["practice_id"] = practice_id; + sess["practice_id"] = practice_id; sess["practice_id"].set_valid(true); sess["practice_user_id"] = practice_users_id; sess["practice_user_id"].set_valid(true);