Skip to content
Permalink
Browse files

fixing merge conflict.

  • Loading branch information
Peter Adams
Peter Adams committed Mar 21, 2020
2 parents 1286f54 + 93919b3 commit 635e1dc0cc1ee5ac230028f9490285b65656f6e8
Showing with 11,851 additions and 8,121 deletions.
  1. +4 −0 .github/FUNDING.yml
  2. +339 −0 LICENCE
  3. +99 −100 conf/messages.php
  4. +41 −41 includes/JSON.php
  5. +46 −0 includes/PHPMailer-6.1.4/COMMITMENT
  6. +19 −21 includes/{PHPMailer_5.2.0 → PHPMailer-6.1.4}/LICENSE
  7. +221 −0 includes/PHPMailer-6.1.4/README.md
  8. +28 −0 includes/PHPMailer-6.1.4/SECURITY.md
  9. +1 −0 includes/PHPMailer-6.1.4/VERSION
  10. +51 −0 includes/PHPMailer-6.1.4/composer.json
  11. +144 −0 includes/PHPMailer-6.1.4/get_oauth_token.php
  12. +25 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-af.php
  13. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-am.php
  14. +27 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-ar.php
  15. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-az.php
  16. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-ba.php
  17. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-be.php
  18. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-bg.php
  19. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-ca.php
  20. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-ch.php
  21. +25 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-cs.php
  22. +6 −6 ...{PHPMailer_5.2.0/language/phpmailer.lang-dk.php → PHPMailer-6.1.4/language/phpmailer.lang-da.php}
  23. +25 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-de.php
  24. +25 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-el.php
  25. +25 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-eo.php
  26. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-es.php
  27. +13 −12 includes/{PHPMailer_5.2.0 → PHPMailer-6.1.4}/language/phpmailer.lang-et.php
  28. +27 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-fa.php
  29. +6 −6 includes/{PHPMailer_5.2.0 → PHPMailer-6.1.4}/language/phpmailer.lang-fi.php
  30. +6 −7 includes/{PHPMailer_5.2.0 → PHPMailer-6.1.4}/language/phpmailer.lang-fo.php
  31. +29 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-fr.php
  32. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-gl.php
  33. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-he.php
  34. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-hi.php
  35. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-hr.php
  36. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-hu.php
  37. +27 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-id.php
  38. +27 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-it.php
  39. +27 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-ja.php
  40. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-ka.php
  41. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-ko.php
  42. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-lt.php
  43. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-lv.php
  44. +25 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-mg.php
  45. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-ms.php
  46. +25 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-nb.php
  47. +28 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-nl.php
  48. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-pl.php
  49. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-pt.php
  50. +29 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-pt_br.php
  51. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-ro.php
  52. +27 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-ru.php
  53. +27 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-sk.php
  54. +27 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-sl.php
  55. +27 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-sr.php
  56. +10 −10 ...{PHPMailer_5.2.0/language/phpmailer.lang-se.php → PHPMailer-6.1.4/language/phpmailer.lang-sv.php}
  57. +27 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-tl.php
  58. +30 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-tr.php
  59. +27 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-uk.php
  60. +26 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-vi.php
  61. +28 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-zh.php
  62. +28 −0 includes/PHPMailer-6.1.4/language/phpmailer.lang-zh_cn.php
  63. +39 −0 includes/PHPMailer-6.1.4/src/Exception.php
  64. +138 −0 includes/PHPMailer-6.1.4/src/OAuth.php
  65. +4,778 −0 includes/PHPMailer-6.1.4/src/PHPMailer.php
  66. +419 −0 includes/PHPMailer-6.1.4/src/POP3.php
  67. +1,370 −0 includes/PHPMailer-6.1.4/src/SMTP.php
  68. +0 −2,473 includes/PHPMailer_5.2.0/class.phpmailer.php
  69. +0 −410 includes/PHPMailer_5.2.0/class.pop3.php
  70. +0 −817 includes/PHPMailer_5.2.0/class.smtp.php
  71. +0 −861 includes/PHPMailer_5.2.0/extras/htmlfilter.php
  72. +0 −27 includes/PHPMailer_5.2.0/language/phpmailer.lang-ar.php
  73. +0 −26 includes/PHPMailer_5.2.0/language/phpmailer.lang-br.php
  74. +0 −26 includes/PHPMailer_5.2.0/language/phpmailer.lang-ca.php
  75. +0 −26 includes/PHPMailer_5.2.0/language/phpmailer.lang-ch.php
  76. +0 −25 includes/PHPMailer_5.2.0/language/phpmailer.lang-cz.php
  77. +0 −25 includes/PHPMailer_5.2.0/language/phpmailer.lang-de.php
  78. +0 −26 includes/PHPMailer_5.2.0/language/phpmailer.lang-es.php
  79. +0 −25 includes/PHPMailer_5.2.0/language/phpmailer.lang-fr.php
  80. +0 −25 includes/PHPMailer_5.2.0/language/phpmailer.lang-hu.php
  81. +0 −27 includes/PHPMailer_5.2.0/language/phpmailer.lang-it.php
  82. +0 −26 includes/PHPMailer_5.2.0/language/phpmailer.lang-ja.php
  83. +0 −25 includes/PHPMailer_5.2.0/language/phpmailer.lang-nl.php
  84. +0 −25 includes/PHPMailer_5.2.0/language/phpmailer.lang-no.php
  85. +0 −25 includes/PHPMailer_5.2.0/language/phpmailer.lang-pl.php
  86. +0 −27 includes/PHPMailer_5.2.0/language/phpmailer.lang-ro.php
  87. +0 −25 includes/PHPMailer_5.2.0/language/phpmailer.lang-ru.php
  88. +0 −27 includes/PHPMailer_5.2.0/language/phpmailer.lang-tr.php
  89. +0 −26 includes/PHPMailer_5.2.0/language/phpmailer.lang-zh.php
  90. +0 −26 includes/PHPMailer_5.2.0/language/phpmailer.lang-zh_cn.php
  91. +12 −12 includes/Snoopy.class.php
  92. +0 −237 includes/httpclient-2009-09-02/test_http.php
  93. 0 includes/{httpclient-2009-09-02 → httpclient-2016-05-02}/LICENSE.txt
  94. +260 −103 includes/{httpclient-2009-09-02 → httpclient-2016-05-02}/http.php
  95. +0 −223 includes/lastRSS.php
  96. +1 −1 includes/memcached-client.php
  97. +4 −4 includes/pqp/classes/MySqlDatabase.php
  98. +1 −1 includes/pqp/classes/PhpQuickProfiler.php
  99. +30 −1 modules/base/apiRequest.php
  100. +107 −0 modules/base/changeUserPasswordCli.php
  101. +2 −0 modules/base/classes/browscap.php
  102. +12 −5 modules/base/classes/client.php
  103. +1 −1 modules/base/classes/daemon.php
  104. +5 −0 modules/base/classes/error.php
  105. +4 −4 modules/base/classes/installController.php
  106. +4 −4 modules/base/classes/installManager.php
  107. +13 −17 modules/base/classes/logFile.php
  108. +20 −23 modules/base/classes/mailer.php
  109. +10 −23 modules/base/classes/paginatedResultSet.php
  110. +3 −3 modules/base/classes/resultSetManager.php
  111. +6 −3 modules/base/classes/sanitize.php
  112. +4 −3 modules/base/classes/settings.php
  113. +86 −67 modules/base/classes/trackingEventHelpers.php
  114. +53 −5 modules/base/classes/userManager.php
  115. +2 −2 modules/base/css/owa.reporting-css-combined.css
  116. +1 −1 modules/base/css/ui.jqgrid.css
  117. +1 −1 modules/base/entities/request.php
  118. +30 −6 modules/base/entities/session.php
  119. +3 −4 modules/base/entities/user.php
  120. +2 −2 modules/base/entities/visitor.php
  121. +0 −7 modules/base/handlers/feedRequestHandlers.php
  122. +1 −1 modules/base/handlers/notifyHandlers.php
  123. +3 −3 modules/base/installBase.php
  124. +151 −151 modules/base/installCheckEnv.php
  125. +1 −1 modules/base/installCli.php
  126. +1 −1 modules/base/installEmbedded.php
  127. +1 −2 modules/base/js/owa.areachart.js
  128. +2 −1 modules/base/js/owa.js
  129. +1 −1 modules/base/js/owa.report.js
  130. +7 −8 modules/base/js/owa.reporting-combined-min.js
  131. +6 −3 modules/base/js/owa.resultSetExplorer.js
  132. +7 −5 modules/base/js/owa.tracker-combined-min.js
  133. +14 −10 modules/base/js/owa.tracker.js
  134. +31 −51 modules/base/module.php
  135. +5 −4 modules/base/passwordResetRequest.php
  136. +5 −1 modules/base/reportAttributionHistory.php
  137. +1 −1 modules/base/reportDomClicks.php
  138. +2 −1 modules/base/templates/apiError.php
  139. +8 −0 modules/base/templates/cli.php
  140. +2 −2 modules/base/templates/config_dom.tpl
  141. +0 −6 modules/base/templates/error_validation_summary.tpl
  142. 0 modules/base/templates/{filter_period.tpl → filter_period.php}
  143. 0 modules/base/templates/{filter_site.tpl → filter_site.php}
  144. +6 −2 modules/base/templates/header.tpl
  145. +9 −1 modules/base/templates/install_defaults_entry.php
  146. +14 −11 modules/base/templates/js_log_tag.tpl
  147. +5 −1 modules/base/templates/json.php
  148. +23 −3 modules/base/templates/msgs.tpl
  149. +12 −7 modules/base/templates/news.tpl
  150. +1 −1 modules/base/templates/report.tpl
  151. +4 −1 modules/base/templates/report_goal_funnel.php
  152. +1 −2 modules/base/templates/report_visitor.tpl
  153. +13 −5 modules/base/templates/row_visitSummary.tpl
  154. +19 −9 modules/base/templates/sites.tpl
  155. +2 −2 modules/base/templates/users_addoredit.tpl
  156. +2 −2 modules/base/updates/004.php
  157. +14 −9 modules/base/usersChangePassword.php
  158. +2 −2 modules/base/usersEdit.php
  159. +9 −9 modules/base/usersResetPassword.php
  160. +12 −11 modules/base/usersSetPassword.php
  161. +5 −4 modules/base/widgetOwaNews.php
  162. +16 −6 modules/maxmind_geoip/classes/maxmind.php
  163. +23 −2 owa_auth.php
  164. +164 −161 owa_base.php
  165. +9 −5 owa_coreAPI.php
  166. +4 −3 owa_entity.php
  167. +2 −2 owa_env.php
  168. +25 −7 owa_lib.php
  169. +0 −161 owa_news.php
  170. +1 −1 owa_requestContainer.php
  171. +17 −2 owa_template.php
  172. +799 −790 owa_view.php
  173. +0 −92 owa_wp.php
  174. +5 −0 plugins/db/owa_db_mysql.php
  175. +1 −1 plugins/log/winstatic.php
  176. +712 −536 wp_plugin.php
@@ -0,0 +1,4 @@
# These are supported funding model platforms

github: padams
custom: https://www.paypal.com/paypalme/my/profile
339 LICENCE

Large diffs are not rendered by default.

@@ -1,101 +1,100 @@
<?php

//
// Open Web Analytics - An Open Source Web Analytics Framework
//
// Copyright 2006 Peter Adams. All rights reserved.
//
// Licensed under GPL v2.0 http://www.gnu.org/copyleft/gpl.html
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// $Id$
//


/**
* Messages and Strings file
*
* @author Peter Adams <peter@openwebanalytics.com>
* @copyright Copyright &copy; 2006 Peter Adams <peter@openwebanalytics.com>
* @license http://www.gnu.org/copyleft/gpl.html GPL v2.0
* @category owa
* @package owa
* @version $Revision$
* @since owa 1.0.0
*/

$_owa_messages = array(

2000 => array("An e-mail containing instructions on how to complete the password reset process has been sent to %s",1),
2001 => array("The e-mail <B>%s</B> was not found in our database. Please check the address and try again.",1),
2002 => array("<B>Login Failed</B>. Your user name or password did not match.",0),
2003 => array("Your Account lacks the necessary privileges to access the requested resource.",0),
2004 => array("You must login to access the requested resource.",0),
2010 => array("Success. Logout Complete.",0),
2011 => array("Error. Can't find your temporary passkey in the db.",0),

// Options/Configuration related
2500 => array("Options Saved.",0),
2501 => array("The module was activated successfully.",0),
2502 => array("The module was deactivated successfully.",0),
2503 => array("Options reset to Default Values.",0),
2504 => array("Entity %s Schema Created.",1),
2504 => array("Goal Saved.",0),


//User managment
3000 => array("Success. User Added.", 0),
3001 => array("Error. That user name is already taken.",0),
3002 => array("The form data that you entered contained one or more errors. Please check the data and submit the from again."),
3003 => array("Success. User profile saved.",0),
3004 => array("Success. User acount deleted."),
3005 => array("Enter Your New Password", 0),
3006 => array("Success. Please login with your new password.",0),
3007 => array("Error. Your passwords must match.",0),
3008 => array("Error. Your password must be %s characters long.", 1),
3009 => array("Error. A user with that email address already exists.", 0),
3010 => array("A user with that email address does not exist.", 0),
3011 => array("Could not update user profile."),
3012 => array("Could not connect the database. Check your settings and try again.",0),

//sites management
3200 => array("Error. Please fill in all required fields.",0),
3201 => array("Success. Site Profile Updated.",0),
3202 => array("Success. Site Added.",0),
3203 => array("Error. Site Could not be added",0),
3204 => array("Success. Site Deleted.",0),
3206 => array("Error. A site with that domain already exists.",0),
3207 => array("Error. You must enter a domain when adding a web site.",0),
3208 => array("Error. That site does not exist.",0),
3208 => array("Please remove the http:// from your beginning of your domain.",0),


//install
3300 => array("Could not connect to the database. Please check the database connection settings in your configuration file and try again.",0),
3301 => array("This version of OWA requires PHP 5.2.x or higher.",0),
3302 => array("Database Schema Installation failed. Please check the error log file for more details.",0),
3303 => array("Success. Default Site Added.",0),
3304 => array("Success. Admin User Added.",0),
3305 => array("Success. Base Database Schema Installed.",0),
3306 => array("Error. User id already exists for some reason.",0),
3307 => array("Updates failed. Check OWA's error log file for more details and try again.",0),
3308 => array("Success. Updates were applied.",0),
3309 => array("Site Domain is required.",0),
3310 => array("E-mail Address is required.",0),
3310 => array("Password is required.",0),
3311 => array("These updates must be applied using the command line interface (CLI). Run <code>'/path/to/php cli.php cmd=update'</code> from your server's command shell to apply these updates. For more information on updating see the install/update page on the wiki.",0),
// Graph related
3500 => array("There is no data for\nthis time period.",0),

// Report Related
3600 => array("Unknown",0)

);


<?php

//
// Open Web Analytics - An Open Source Web Analytics Framework
//
// Copyright 2006 Peter Adams. All rights reserved.
//
// Licensed under GPL v2.0 http://www.gnu.org/copyleft/gpl.html
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an 'AS IS' BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
// $Id$
//


/**
* Messages and Strings file
*
* @author Peter Adams <peter@openwebanalytics.com>
* @copyright Copyright &copy; 2006 Peter Adams <peter@openwebanalytics.com>
* @license http://www.gnu.org/copyleft/gpl.html GPL v2.0
* @category owa
* @package owa
* @version $Revision$
* @since owa 1.0.0
*/

$_owa_messages = [
2000 => ['headline' => 'Success', 'message' => 'An e-mail containing instructions on how to complete the password reset process has been sent to %s'],
2001 => ['headline' => 'Error', 'message' => 'The e-mail %s was not found in our database. Please check the address and try again.'],
2002 => ['headline' => 'Login Failed', 'message' => 'Your user name or password did not match.'],
2003 => ['headline' => 'Error', 'message' => 'Your Account lacks the necessary privileges to access the requested resource.'],
2004 => ['headline' => 'Error', 'message' => 'You must login to access the requested resource.'],
2010 => ['headline' => 'Success', 'message' => 'Logout Complete.'],
2011 => ['headline' => 'Error', 'message' => 'Can\'t find your temporary passkey in the db.'],

// Options/Configuration related
2500 => ['headline' => 'Success', 'message' => 'Options Saved.'],
2501 => ['headline' => 'Success', 'message' => 'The module was activated successfully.'],
2502 => ['headline' => 'Success', 'message' => 'The module was deactivated successfully.'],
2503 => ['headline' => 'Success', 'message' => 'Options reset to Default Values.'],
2504 => ['headline' => 'Success', 'message' => 'Entity %s Schema Created.'],
2504 => ['headline' => 'Success', 'message' => 'Goal Saved.'],


//User managment
3000 => ['headline' => 'Success', 'message' => 'User Added.',],
3001 => ['headline' => 'Error', 'message' => 'That user name is already taken.'],
3002 => ['headline' => 'Error', 'message' => 'The form data that you entered contained one or more errors. Please check the data and submit the from again.'],
3003 => ['headline' => 'Success', 'message' => 'User profile saved.'],
3004 => ['headline' => 'Success', 'message' => 'User acount deleted.'],
3005 => ['message' => 'Enter Your New Password',],
3006 => ['headline' => 'Success', 'message' => 'Please login with your new password.'],
3007 => ['headline' => 'Error', 'message' => 'Your passwords must match.'],
3008 => ['headline' => 'Error', 'message' => 'Your password must be %s characters long.',],
3009 => ['headline' => 'Error', 'message' => 'A user with that email address already exists.',],
3010 => ['headline' => 'Error', 'message' => 'A user with that email address does not exist.',],
3011 => ['headline' => 'Error', 'message' => 'Could not update user profile.'],
3012 => ['headline' => 'Error', 'message' => 'Could not connect the database. Check your settings and try again.'],

//sites management
3200 => ['headline' => 'Error', 'message' => 'Please fill in all required fields.'],
3201 => ['headline' => 'Success', 'message' => 'Site Profile Updated.'],
3202 => ['headline' => 'Success', 'message' => 'Site Added.'],
3203 => ['headline' => 'Error', 'message' => 'Site Could not be added'],
3204 => ['headline' => 'Success', 'message' => 'Site Deleted.'],
3206 => ['headline' => 'Error', 'message' => 'A site with that domain already exists.'],
3207 => ['headline' => 'Error', 'message' => 'You must enter a domain when adding a web site.'],
3208 => ['headline' => 'Error', 'message' => 'That site does not exist.'],
3208 => ['headline' => 'Error', 'message' => 'Please remove the http:// from your beginning of your domain.'],


//install
3300 => ['headline' => 'Error', 'message' => 'Could not connect to the database. Please check the database connection settings in your configuration file and try again.'],
3301 => ['headline' => 'Error', 'message' => 'This version of OWA requires PHP 5.2.x or higher.'],
3302 => ['headline' => 'Error', 'message' => 'Database Schema Installation failed. Please check the error log file for more details.'],
3303 => ['headline' => 'Success', 'message' => 'Default Site Added.'],
3304 => ['headline' => 'Success', 'message' => 'Admin User Added.'],
3305 => ['headline' => 'Success', 'message' => 'Base Database Schema Installed.'],
3306 => ['headline' => 'Error', 'message' => 'User id already exists for some reason.'],
3307 => ['headline' => 'Error', 'message' => 'Updates failed. Check OWA\'s error log file for more details and try again.'],
3308 => ['headline' => 'Success', 'message' => 'Updates were applied.'],
3309 => ['headline' => 'Error', 'message' => 'Site Domain is required.'],
3310 => ['headline' => 'Error', 'message' => 'E-mail Address is required.'],
3310 => ['headline' => 'Error', 'message' => 'Password is required.'],
3311 => ['headline' => 'Error', 'message' => 'These updates must be applied using the command line interface (CLI). Run <code>\'/path/to/php cli.php cmd=update\'</code> from your server\'s command shell to apply these updates. For more information on updating see the install/update page on the wiki.'],

// Graph related
3500 => ['headline' => 'Error', 'message' => 'There is no data for\nthis time period.'],

// Report Related
3600 => ['headline' => 'Error', 'message' => 'Unknown'],
];


?>

0 comments on commit 635e1dc

Please sign in to comment.
You can’t perform that action at this time.