Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Release 6.2.1

  • Loading branch information...
commit 68b9a688b93f7ebc3a76c11850bb809178ab0470 1 parent 86ce033
John Mertic jmertic authored
Showing with 3,587 additions and 867 deletions.
  1. +3 −1 data/SugarBean.php
  2. +135 −123 files.md5
  3. +32 −15 include/Dashlets/DashletGeneric.php
  4. +17 −17 include/Dashlets/DashletGenericDisplay.tpl
  5. +6 −6 include/ListView/ListViewNoMassUpdate.tpl
  6. +2 −2 include/ListView/ListViewSmarty.php
  7. +1 −0  include/MVC/Controller/entry_point_registry.php
  8. +1 −1  include/MVC/SugarApplication.php
  9. +3 −0  include/MVC/View/SugarView.php
  10. +1 −1  include/MVC/View/views/view.popup.php
  11. +1 −1  include/MassUpdate.php
  12. +11 −1 include/Popups/PopupSmarty.php
  13. +0 −29 include/QuickSearchDefaults.php
  14. +43 −0 include/SugarCache/SugarCache.php
  15. +17 −11 include/SugarCharts/Jit/js/Jit/jit.js
  16. +4 −3 include/SugarCharts/Jit/js/mySugarCharts.js
  17. +21 −6 include/SugarCharts/Jit/js/sugarCharts.js
  18. +13 −6 include/SugarCharts/Jit/tpls/chart.tpl
  19. +3 −1 include/SugarFields/Fields/Collection/SugarFieldCollection.js
  20. +3 −4 include/SugarFields/Fields/Collection/ViewSugarFieldCollection.php
  21. +3 −1 include/SugarFields/Fields/File/SugarFieldFile.js
  22. +23 −4 include/SugarFields/Fields/File/SugarFieldFile.php
  23. +3 −3 include/SugarFields/Fields/Iframe/DetailView.tpl
  24. +45 −21 include/SugarObjects/VardefManager.php
  25. +1 −0  include/SugarObjects/templates/file/vardefs.php
  26. +14 −8 include/SugarObjects/templates/person/Person.php
  27. +2 −9 include/TemplateHandler/TemplateHandler.php
  28. +13 −2 include/connectors/sources/default/source.php
  29. +1 −0  include/database/MysqliManager.php
  30. +2 −1  include/dir_inc.php
  31. +1 −1  include/externalAPI/ExternalAPIFactory.php
  32. +20 −3 include/formbase.php
  33. +44 −41 include/generic/LayoutManager.php
  34. +2 −2 include/javascript/sugar_3.js
  35. +2 −2 include/javascript/sugar_grp1.js
  36. +3 −1 include/javascript/sugar_grp_emails.js
  37. +3 −1 include/javascript/sugar_grp_quickcomp.js
  38. +4 −1 include/language/en_us.lang.php
  39. +36 −14 include/utils.php
  40. +1 −1  include/utils/mvc_utils.php
  41. +6 −0 include/utils/php_zip_utils.php
  42. +20 −0 install/install_utils.php
  43. +4 −0 install/performSetup.php
  44. +181 −18 jssource/src_files/include/SugarCharts/Jit/js/Jit/jit.js
  45. +10 −26 jssource/src_files/include/SugarCharts/Jit/js/mySugarCharts.js
  46. +114 −4 jssource/src_files/include/SugarCharts/Jit/js/sugarCharts.js
  47. +8 −1 jssource/src_files/include/SugarFields/Fields/Collection/SugarFieldCollection.js
  48. +15 −4 jssource/src_files/include/SugarFields/Fields/File/SugarFieldFile.js
  49. +2 −1  jssource/src_files/include/javascript/sugar_3.js
  50. +1 −1  modules/ACLActions/ACLAction.php
  51. +1 −1  modules/ACLRoles/DetailUserRole.php
  52. +1 −1  modules/ACLRoles/ListUsers.php
  53. +1 −1  modules/ACLRoles/views/view.list.php
  54. +1 −1  modules/Administration/metadata/adminpaneldefs.php
  55. +4 −1 modules/Campaigns/TrackDetailView.php
  56. +7 −1 modules/Connectors/InstallDefaultConnectors.php
  57. +133 −0 modules/Connectors/connectors/sources/ext/rest/insideview/InsideView.en_us.tpl
  58. +209 −0 modules/Connectors/connectors/sources/ext/rest/insideview/InsideViewLogicHook.php
  59. BIN  modules/Connectors/connectors/sources/ext/rest/insideview/images/close.png
  60. BIN  modules/Connectors/connectors/sources/ext/rest/insideview/images/insideview.png
  61. BIN  modules/Connectors/connectors/sources/ext/rest/insideview/images/insideview_collapsed.png
  62. BIN  modules/Connectors/connectors/sources/ext/rest/insideview/images/insideview_expanded.png
  63. BIN  modules/Connectors/connectors/sources/ext/rest/insideview/images/video.png
  64. +105 −0 modules/Connectors/connectors/sources/ext/rest/insideview/insideview.php
  65. +55 −0 modules/Connectors/connectors/sources/ext/rest/insideview/mapping.php
  66. +29 −1 modules/Connectors/controller.php
  67. +7 −2 modules/Connectors/views/view.displayproperties.php
  68. +1 −1  modules/Connectors/views/view.modifydisplay.php
  69. +1 −1  modules/Connectors/views/view.modifymapping.php
  70. +1 −1  modules/Connectors/views/view.modifyproperties.php
  71. +1 −1  modules/Connectors/views/view.modifysearch.php
  72. +6 −2 modules/Contacts/Contact.php
  73. +9 −0 modules/Contacts/metadata/detailviewdefs.php
  74. +10 −0 modules/Documents/metadata/subpanels/default.php
  75. +18 −3 modules/DynamicFields/DynamicField.php
  76. +63 −0 modules/EmailMan/EmailImage.php
  77. +2 −0  modules/Emails/EmailUI.css
  78. +1 −1  modules/Employees/controller.php
  79. +1 −1  modules/Employees/views/view.detail.php
  80. +2 −2 modules/Employees/views/view.list.php
  81. +8 −59 modules/Home/quicksearchQuery.php
  82. +4 −0 modules/Import/views/view.step2.php
  83. +1 −1  modules/Import/views/view.step4.php
  84. +1 −1  modules/InboundEmail/EditView.html
  85. +10 −1 modules/InboundEmail/EditView.php
  86. +1 −0  modules/InboundEmail/language/en_us.lang.php
  87. +2 −2 modules/ModuleBuilder/Module/StudioBrowser.php
  88. +3 −3 modules/ModuleBuilder/controller.php
  89. +7 −5 modules/ModuleBuilder/views/view.module.php
  90. +18 −15 modules/ModuleBuilder/views/view.modulefields.php
  91. +2 −2 modules/MySettings/StoreQuery.php
  92. +13 −21 modules/Prospects/Prospect.php
  93. +2 −2 modules/SavedSearch/SavedSearch.php
  94. +6 −0 modules/Trackers/store/TrackerSessionsDatabaseStore.php
  95. +4 −2 modules/UpgradeWizard/SugarMerge/EditViewMerge.php
  96. +1 −1  modules/UpgradeWizard/commit.php
  97. +11 −2 modules/UpgradeWizard/end.php
  98. +6 −0 modules/UpgradeWizard/preflight.php
  99. +10 −1 modules/UpgradeWizard/silentUpgrade.php
  100. +1 −1  modules/UpgradeWizard/silentUpgrade_dce_step1.php
  101. +1 −1  modules/UpgradeWizard/silentUpgrade_dce_step2.php
  102. +5 −3 modules/UpgradeWizard/silentUpgrade_step1.php
  103. +20 −2 modules/UpgradeWizard/silentUpgrade_step2.php
  104. +48 −10 modules/UpgradeWizard/uw_utils.php
  105. +6 −6 modules/Users/DetailView.php
  106. +3 −3 modules/Users/EditView.php
  107. +1 −1  modules/Users/Menu.php
  108. +4 −4 modules/Users/Save.php
  109. +190 −9 modules/Users/User.php
  110. +3 −4 modules/Users/authentication/SAMLAuthenticate/index.php
  111. +1 −1  modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml.php
  112. +35 −13 modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/authrequest.php
  113. +50 −13 modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/response.php
  114. +31 −1 modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/settings.php
  115. +74 −12 modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/xmlsec.php
  116. +1 −1  modules/Users/authentication/SAMLAuthenticate/lib/xmlseclibs/xmlseclibs.php
  117. +19 −14 modules/Users/authentication/SAMLAuthenticate/settings.php
  118. +2 −2 modules/Users/controller.php
  119. +1 −1  modules/Users/metadata/subpaneldefs.php
  120. +1 −2  modules/Users/reassignUserRecords.php
  121. +2 −2 modules/Users/views/view.list.php
  122. +23 −0 soap/SoapHelperFunctions.php
  123. +20 −3 soap/SoapSugarUsers.php
  124. +4 −4 sugar_version.php
  125. +7 −0 tests/PHPUnit/ChangeLog.markdown
  126. +5 −5 tests/PHPUnit/File/Iterator.php
  127. +10 −6 tests/PHPUnit/File/Iterator/Factory.php
  128. +1 −1  tests/PHPUnit/PHPUnit/Extensions/GroupTestSuite.php
  129. +1 −1  tests/PHPUnit/PHPUnit/Extensions/OutputTestCase.php
  130. +1 −1  tests/PHPUnit/PHPUnit/Extensions/PhptTestCase.php
  131. +1 −1  tests/PHPUnit/PHPUnit/Extensions/PhptTestCase/Logger.php
  132. +1 −1  tests/PHPUnit/PHPUnit/Extensions/PhptTestSuite.php
  133. +1 −1  tests/PHPUnit/PHPUnit/Extensions/RepeatedTest.php
  134. +1 −1  tests/PHPUnit/PHPUnit/Extensions/Story/Given.php
  135. +1 −1  tests/PHPUnit/PHPUnit/Extensions/Story/ResultPrinter.php
  136. +1 −1  tests/PHPUnit/PHPUnit/Extensions/Story/ResultPrinter/HTML.php
  137. +1 −1  tests/PHPUnit/PHPUnit/Extensions/Story/ResultPrinter/Text.php
  138. +1 −1  tests/PHPUnit/PHPUnit/Extensions/Story/Scenario.php
  139. +1 −1  tests/PHPUnit/PHPUnit/Extensions/Story/Step.php
  140. +1 −1  tests/PHPUnit/PHPUnit/Extensions/Story/TestCase.php
  141. +1 −1  tests/PHPUnit/PHPUnit/Extensions/Story/Then.php
  142. +1 −1  tests/PHPUnit/PHPUnit/Extensions/Story/When.php
  143. +1 −1  tests/PHPUnit/PHPUnit/Extensions/TestDecorator.php
  144. +1 −1  tests/PHPUnit/PHPUnit/Extensions/TicketListener.php
  145. +1 −1  tests/PHPUnit/PHPUnit/Extensions/TicketListener/GitHub.php
  146. +1 −1  tests/PHPUnit/PHPUnit/Extensions/TicketListener/GoogleCode.php
  147. +1 −1  tests/PHPUnit/PHPUnit/Extensions/TicketListener/Trac.php
  148. +1 −1  tests/PHPUnit/PHPUnit/Framework/Assert.php
  149. +4 −0 tests/PHPUnit/PHPUnit/Framework/Assert/Functions.php
  150. +44 −0 tests/PHPUnit/PHPUnit/Framework/Assert/Functions.php.in
  151. +1 −1  tests/PHPUnit/PHPUnit/Framework/AssertionFailedError.php
  152. +1 −1  tests/PHPUnit/PHPUnit/Framework/ComparisonFailure.php
  153. +1 −1  tests/PHPUnit/PHPUnit/Framework/ComparisonFailure/Array.php
  154. +1 −1  tests/PHPUnit/PHPUnit/Framework/ComparisonFailure/Object.php
  155. +1 −1  tests/PHPUnit/PHPUnit/Framework/ComparisonFailure/Scalar.php
  156. +1 −1  tests/PHPUnit/PHPUnit/Framework/ComparisonFailure/String.php
  157. +1 −1  tests/PHPUnit/PHPUnit/Framework/ComparisonFailure/Type.php
  158. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint.php
  159. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/And.php
  160. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/ArrayHasKey.php
  161. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/Attribute.php
  162. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/ClassHasAttribute.php
  163. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/ClassHasStaticAttribute.php
  164. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/FileExists.php
  165. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/GreaterThan.php
  166. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/IsAnything.php
  167. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/IsEmpty.php
  168. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/IsEqual.php
  169. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/IsFalse.php
  170. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/IsIdentical.php
  171. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/IsInstanceOf.php
  172. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/IsNull.php
  173. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/IsTrue.php
  174. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/IsType.php
  175. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/LessThan.php
  176. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/Not.php
  177. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/ObjectHasAttribute.php
  178. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/Or.php
  179. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/PCREMatch.php
  180. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/StringContains.php
  181. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/StringEndsWith.php
  182. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/StringMatches.php
  183. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/StringStartsWith.php
  184. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/TraversableContains.php
  185. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/TraversableContainsOnly.php
  186. +1 −1  tests/PHPUnit/PHPUnit/Framework/Constraint/Xor.php
  187. +1 −1  tests/PHPUnit/PHPUnit/Framework/Error.php
  188. +1 −1  tests/PHPUnit/PHPUnit/Framework/Error/Notice.php
  189. +1 −1  tests/PHPUnit/PHPUnit/Framework/Error/Warning.php
  190. +1 −1  tests/PHPUnit/PHPUnit/Framework/Exception.php
  191. +1 −1  tests/PHPUnit/PHPUnit/Framework/ExpectationFailedException.php
  192. +1 −1  tests/PHPUnit/PHPUnit/Framework/IncompleteTest.php
  193. +1 −1  tests/PHPUnit/PHPUnit/Framework/IncompleteTestError.php
  194. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Builder/Identity.php
  195. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Builder/InvocationMocker.php
  196. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Builder/Match.php
  197. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Builder/MethodNameMatch.php
  198. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Builder/Namespace.php
  199. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Builder/ParametersMatch.php
  200. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Builder/Stub.php
  201. +25 −3 tests/PHPUnit/PHPUnit/Framework/MockObject/Generator.php
  202. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Generator/mocked_class.tpl.dist
  203. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Invocation.php
  204. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Invocation/Object.php
  205. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Invocation/Static.php
  206. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/InvocationMocker.php
  207. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Invokable.php
  208. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Matcher.php
  209. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Matcher/AnyInvokedCount.php
  210. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Matcher/AnyParameters.php
  211. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Matcher/Invocation.php
  212. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Matcher/InvokedAtIndex.php
  213. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Matcher/InvokedAtLeastOnce.php
  214. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Matcher/InvokedCount.php
  215. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Matcher/InvokedRecorder.php
  216. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Matcher/MethodName.php
  217. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Matcher/Parameters.php
  218. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Matcher/StatelessInvocation.php
  219. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/MockObject.php
  220. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Stub.php
  221. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/ConsecutiveCalls.php
  222. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/Exception.php
  223. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/MatcherCollection.php
  224. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/Return.php
  225. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/ReturnArgument.php
  226. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/ReturnCallback.php
  227. +1 −1  tests/PHPUnit/PHPUnit/Framework/MockObject/Verifiable.php
  228. +1 −1  tests/PHPUnit/PHPUnit/Framework/SelfDescribing.php
  229. +1 −1  tests/PHPUnit/PHPUnit/Framework/SkippedTest.php
  230. +1 −1  tests/PHPUnit/PHPUnit/Framework/SkippedTestError.php
  231. +1 −1  tests/PHPUnit/PHPUnit/Framework/SkippedTestSuiteError.php
  232. +1 −1  tests/PHPUnit/PHPUnit/Framework/SyntheticError.php
  233. +1 −1  tests/PHPUnit/PHPUnit/Framework/Test.php
  234. +1 −1  tests/PHPUnit/PHPUnit/Framework/TestCase.php
  235. +1 −1  tests/PHPUnit/PHPUnit/Framework/TestFailure.php
  236. +1 −1  tests/PHPUnit/PHPUnit/Framework/TestListener.php
  237. +1 −1  tests/PHPUnit/PHPUnit/Framework/TestResult.php
  238. +1 −1  tests/PHPUnit/PHPUnit/Framework/TestSuite.php
  239. +1 −1  tests/PHPUnit/PHPUnit/Framework/TestSuite/DataProvider.php
  240. +1 −1  tests/PHPUnit/PHPUnit/Framework/Warning.php
  241. +1 −1  tests/PHPUnit/PHPUnit/Runner/BaseTestRunner.php
  242. +1 −1  tests/PHPUnit/PHPUnit/Runner/IncludePathTestCollector.php
  243. +1 −1  tests/PHPUnit/PHPUnit/Runner/StandardTestSuiteLoader.php
  244. +1 −1  tests/PHPUnit/PHPUnit/Runner/TestCollector.php
  245. +1 −1  tests/PHPUnit/PHPUnit/Runner/TestSuiteLoader.php
  246. +3 −3 tests/PHPUnit/PHPUnit/Runner/Version.php
  247. +1 −1  tests/PHPUnit/PHPUnit/TextUI/Command.php
  248. +1 −1  tests/PHPUnit/PHPUnit/TextUI/ResultPrinter.php
  249. +1 −1  tests/PHPUnit/PHPUnit/TextUI/TestRunner.php
  250. +20 −22 tests/PHPUnit/PHPUnit/Util/Class.php
  251. +1 −1  tests/PHPUnit/PHPUnit/Util/Configuration.php
  252. +1 −1  tests/PHPUnit/PHPUnit/Util/DeprecatedFeature.php
  253. +1 −1  tests/PHPUnit/PHPUnit/Util/DeprecatedFeature/Logger.php
  254. +1 −1  tests/PHPUnit/PHPUnit/Util/Diff.php
  255. +1 −1  tests/PHPUnit/PHPUnit/Util/ErrorHandler.php
  256. +1 −1  tests/PHPUnit/PHPUnit/Util/File.php
  257. +1 −1  tests/PHPUnit/PHPUnit/Util/Fileloader.php
  258. +7 −2 tests/PHPUnit/PHPUnit/Util/Filesystem.php
  259. +1 −1  tests/PHPUnit/PHPUnit/Util/Filter.php
  260. +1 −1  tests/PHPUnit/PHPUnit/Util/Getopt.php
  261. +1 −1  tests/PHPUnit/PHPUnit/Util/GlobalState.php
  262. +1 −1  tests/PHPUnit/PHPUnit/Util/InvalidArgumentHelper.php
  263. +1 −1  tests/PHPUnit/PHPUnit/Util/Log/DBUS.php
  264. +1 −1  tests/PHPUnit/PHPUnit/Util/Log/JSON.php
  265. +1 −1  tests/PHPUnit/PHPUnit/Util/Log/JUnit.php
  266. +1 −1  tests/PHPUnit/PHPUnit/Util/Log/TAP.php
  267. +1 −1  tests/PHPUnit/PHPUnit/Util/Log/XHProf.php
  268. +1 −1  tests/PHPUnit/PHPUnit/Util/PHP.php
  269. +1 −1  tests/PHPUnit/PHPUnit/Util/PHP/Default.php
  270. +1 −1  tests/PHPUnit/PHPUnit/Util/PHP/Windows.php
  271. +1 −1  tests/PHPUnit/PHPUnit/Util/Printer.php
  272. +1 −1  tests/PHPUnit/PHPUnit/Util/Skeleton.php
  273. +1 −1  tests/PHPUnit/PHPUnit/Util/Skeleton/Class.php
  274. +1 −1  tests/PHPUnit/PHPUnit/Util/Skeleton/Test.php
  275. +1 −1  tests/PHPUnit/PHPUnit/Util/Test.php
  276. +3 −3 tests/PHPUnit/PHPUnit/Util/TestDox/NamePrettifier.php
  277. +1 −1  tests/PHPUnit/PHPUnit/Util/TestDox/ResultPrinter.php
  278. +1 −1  tests/PHPUnit/PHPUnit/Util/TestDox/ResultPrinter/HTML.php
  279. +1 −1  tests/PHPUnit/PHPUnit/Util/TestDox/ResultPrinter/Text.php
  280. +1 −1  tests/PHPUnit/PHPUnit/Util/TestSuiteIterator.php
  281. +1 −1  tests/PHPUnit/PHPUnit/Util/Type.php
  282. +1 −1  tests/PHPUnit/PHPUnit/Util/XML.php
  283. +2 −2 tests/SugarTestEmailUtilities.php
  284. +83 −0 tests/include/Popup/Bug44324Test.php
  285. +2 −2 tests/include/SubPanel/Bug41738Test.php
  286. +104 −0 tests/include/SugarObjects/Bug32797Test.php
  287. +6 −6 tests/modules/Documents/Bug43560Test.php
  288. +173 −0 tests/modules/DynamicFields/Bug34993Test.php
  289. +65 −0 tests/modules/Home/Bug43395Test.php
  290. +4 −4 tests/modules/Import/ImportFieldSanitizeTest.php
  291. +2 −2 tests/modules/Import/ImportMapTest.php
  292. +5 −5 tests/modules/Import/UsersLastImportTest.php
  293. +58 −0 tests/modules/ModuleBuilder/views/Bug44372Test.php
  294. +65 −0 tests/modules/SavedSearch/Bug44908Test.php
  295. +99 −0 tests/modules/UpgradeWizard/Bug44414Test.php
  296. +126 −0 tests/modules/UpgradeWizard/SugarMerge/Bug44472Test.php
  297. +184 −0 tests/modules/UpgradeWizard/SugarMerge/od_metadata_files/610/custom/modules/Cases/metadata/editviewdefs.php
  298. +100 −0 tests/modules/UpgradeWizard/SugarMerge/od_metadata_files/610/oob/modules/Cases/metadata/editviewdefs.php
  299. +5 −0 tests/modules/UpgradeWizard/UWUtilsTest.php
  300. +2 −2 tests/service/RESTAPI4Test.php
Sorry, we could not display the entire diff because too many files (302) changed.
4 data/SugarBean.php
View
@@ -5023,7 +5023,9 @@ function bean_implements($interface)
function ACLAccess($view,$is_owner='not_set')
{
global $current_user;
- if(is_admin($current_user)||is_admin_for_module($current_user,$this->getACLCategory()))return true;
+ if($current_user->isAdminForModule($this->getACLCategory())) {
+ return true;
+ }
$not_set = false;
if($is_owner == 'not_set')
{
258 files.md5
View
@@ -1,13 +1,13 @@
<?php
-// created: 2011-05-31 15:30:28
+// created: 2011-07-13 20:29:36
$md5_string = array (
'./LICENSE.txt' => 'd3f150e4a5bed444763ebe8a81742a95',
'./.htaccess' => 'd41d8cd98f00b204e9800998ecf8427e',
'./config.php' => 'd41d8cd98f00b204e9800998ecf8427e',
- './vcal_server.php' => 'c472160ffe5a5ef1e7059e936376c096',
'./vCard.php' => '32f72a62ace4e8d01456a7792ac554c3',
'./themes/default/js/style.js' => 'bba8e2c3565583b6d038349560659797',
'./themes/default/images/start_meeting_inline.png' => '64eff1bab8d34659c583ca84ce36dd2a',
+ './themes/default/images/plug-in_Lotus.png' => '8ba415f9e8ea352c76ed7deddbc1a653',
'./themes/default/images/join_meeting_inline.png' => 'edf7837b58451bbfb4e9e827d9a13a22',
'./themes/default/images/join_imeeting.gif' => 'efd4a8747417083048b1a256d1d715cd',
'./themes/default/images/create-record.gif' => '26aa1d757ecdaa1f886cd2bfb24eddd5',
@@ -585,7 +585,7 @@ $md5_string = array (
'./themes/default/images/Accounts.gif' => 'e081de07d0263b270d0d306642375901',
'./themes/default/css/wizard.css' => '4f828507b4421149a80bfc89ed818753',
'./themes/default/css/style.css' => 'd41d8cd98f00b204e9800998ecf8427e',
- './themes/default/css/print.css' => '80e315af8867df5d57aeaa80d99ae432',
+ './themes/default/css/print.css' => '166d6dff04138c56325ff31e7eeecab0',
'./themes/default/css/deprecated.css' => '872d2ee2f45eb595825646cb39a82fab',
'./themes/default/css/chart.css' => '493edb0e181f685fd595c483d09012fb',
'./themes/Sugar5/tpls/header.tpl' => '26699f278acc189db3a348b939a97d24',
@@ -1169,14 +1169,14 @@ $md5_string = array (
'./themes/Sugar5/css/print.css' => '041ba7c460d78a693301c7061139af89',
'./themes/Sugar5/css/deprecated.css' => '872d2ee2f45eb595825646cb39a82fab',
'./themes/Sugar5/css/chart.css' => '493edb0e181f685fd595c483d09012fb',
- './sugar_version.php' => '7e96a66839daf152cea83bca3a95551c',
+ './sugar_version.php' => 'e0f4077bbaa29cf439bd27bc79fd7c4c',
'./soap/SoapTypes.php' => 'f38a0ac79874c8a3e126d728bd05e00a',
- './soap/SoapSugarUsers.php' => '9ec57f75884c6a1091c3db0f80e930ec',
+ './soap/SoapSugarUsers.php' => 'aec5ba181325721fa9e6da7e6a787687',
'./soap/SoapStudio.php' => '2f424bab502055acae4131df64465e0c',
'./soap/SoapRelationshipHelper.php' => '4d84e017ea0ebe080809c9099ab5ec30',
'./soap/SoapPortalUsers.php' => 'e333fe9ad228db47711d1f506b69f079',
'./soap/SoapPortalHelper.php' => '75ee76c6f6663e49b5c9a029412f7bed',
- './soap/SoapHelperFunctions.php' => 'daafd6d172a4f92c495fade94a07c86e',
+ './soap/SoapHelperFunctions.php' => 'ecd540f7321209bf5ef7615fdf3277e5',
'./soap/SoapErrorDefinitions.php' => '33fda5814773de4025739ab9024f063a',
'./soap/SoapError.php' => 'b2759317cb609e41ffca9da3274b8142',
'./soap/SoapDeprecated.php' => '70d81bfc3a075073bf8a409d08e86f62',
@@ -1224,6 +1224,7 @@ $md5_string = array (
'./service/core/REST/SugarRest.php' => '7d4f007d66668ca9377fce1f34f94d27',
'./service/core/PHP5Soap.php' => '598eeeefcc5ed1276020bfe6fa7c4451',
'./service/core/NusoapSoap.php' => 'e533d700071eafffd2ebfd1e28b2b735',
+ './vcal_server.php' => 'c472160ffe5a5ef1e7059e936376c096',
'./robots.txt' => 'f71d20196d4caf35b6a670db8c70b03d',
'./removeme.php' => '750092ac2fec3ba2f04f0bff27bec33d',
'./pdf.php' => 'cc6788d5e02f50b1812ddb2ff3eb3703',
@@ -1268,10 +1269,10 @@ $md5_string = array (
'./modules/Users/User.js' => '241f1d3d0135f7ca698b062e0f13c2b8',
'./modules/Users/login.js' => 'ea80d72447ec3975a9e6d291d4a812cc',
'./modules/Users/views/view.wizard.php' => '835338a6bbf0fd03bd9827492cf19337',
- './modules/Users/views/view.list.php' => 'b43005b6a3b1a53497cd92f40bcbe471',
+ './modules/Users/views/view.list.php' => '8bc5a879644c94372a52d240cb7ecb03',
'./modules/Users/vardefs.php' => 'fb892f832936653d5321bedcfb653507',
'./modules/Users/tpls/wizard.tpl' => 'd6c63ab8f30ad8c28b8b0ddbb0777803',
- './modules/Users/reassignUserRecords.php' => 'ce1088a7951ad811a4ff5e4a16b50746',
+ './modules/Users/reassignUserRecords.php' => 'cd6548bd2a6d23217f065a4223071983',
'./modules/Users/password_utils.php' => '614d9ea87a83d7c210bbfe585908b870',
'./modules/Users/metadata/subpanels/default.php' => '8ccd5a2436c48f152588bd59e6c6bcb0',
'./modules/Users/metadata/subpanels/ForTeams.php' => '96a782f23790b32bfd101f7f5f86cb2a',
@@ -1280,7 +1281,7 @@ $md5_string = array (
'./modules/Users/metadata/subpanels/ForMeetings.php' => '8b16caaf5651904ee91c1b2d9dae19c6',
'./modules/Users/metadata/subpanels/ForEmails.php' => 'a077f9541d08415783d47899544574ce',
'./modules/Users/metadata/subpanels/ForCalls.php' => '624f240be051035ffdb0880a2d03c2a4',
- './modules/Users/metadata/subpaneldefs.php' => '709186b6fdbadda9cababed057b7ef5d',
+ './modules/Users/metadata/subpaneldefs.php' => 'bc2749768f23c8680586862a4eb63aed',
'./modules/Users/metadata/searchdefs.php' => '6f1c14eecf7c3775bcd95ed5a1a110fa',
'./modules/Users/metadata/reassignScriptMetadata.php' => 'c3b8c884116a57082ac615416176b294',
'./modules/Users/metadata/popupdefs.php' => '0372e0370745358af86d41aef6451901',
@@ -1290,18 +1291,18 @@ $md5_string = array (
'./modules/Users/login.css' => '12d8483e8f6da8e1a95d54b1b50d0ec9',
'./modules/Users/language/en_us.lang.php' => '22a5e8386ce20959eb167d62aea2c2e0',
'./modules/Users/field_arrays.php' => '3c31038add3a77287e815bc5a7a7a609',
- './modules/Users/controller.php' => '147401614d01bd9f2e408a52c59cee9e',
+ './modules/Users/controller.php' => '80b928a09b15d4c9df8904317880974f',
'./modules/Users/authentication/SugarAuthenticate/SugarAuthenticateUser.php' => '406f625eb707435e7710880c7aec779e',
'./modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php' => '5b0f31fa450a1be1a031902b60e0641d',
- './modules/Users/authentication/SAMLAuthenticate/settings.php' => '871bd3ac7732d6172a0320d52b938420',
- './modules/Users/authentication/SAMLAuthenticate/lib/xmlseclibs/xmlseclibs.php' => '05070f789165351c2946c679611fe44a',
+ './modules/Users/authentication/SAMLAuthenticate/settings.php' => '59100a0b5557c457b5b317014090086b',
+ './modules/Users/authentication/SAMLAuthenticate/lib/xmlseclibs/xmlseclibs.php' => '76623791faf895bcbbd016d9945e8c48',
'./modules/Users/authentication/SAMLAuthenticate/lib/xmlseclibs/CHANGELOG.txt' => '113d14ef4333039359236ffed624fb85',
- './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/xmlsec.php' => '8cb35c75b9c09e3272ad3c627ed1546d',
- './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/settings.php' => '5d1043271a8c7c9460298216a8fa6ef9',
- './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/response.php' => 'a53b94607ab662938184a76fce86696d',
- './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/authrequest.php' => 'faea297ec834b918f4452a28803c74ac',
- './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml.php' => '9daa3f46b708efe880c43367cb24dff1',
- './modules/Users/authentication/SAMLAuthenticate/index.php' => '0b7cae26cc46589daa26b226054c1b8b',
+ './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/xmlsec.php' => '0804d079f7dd5b88a810d3b2f13b54a1',
+ './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/settings.php' => 'bf420ca408bb2c25ee04d6d24651306c',
+ './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/response.php' => 'fe50684dde6449668ec090969855ed59',
+ './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/authrequest.php' => 'd7a4ffc11bed1fc0d0879199b4f43051',
+ './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml.php' => '881ac527f24c2cd34b2565dcca59834a',
+ './modules/Users/authentication/SAMLAuthenticate/index.php' => 'ef9efccd250f104fc518337da1df0ac3',
'./modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticateUser.php' => '1018414a0257107a46213d6b918e3e06',
'./modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticate.php' => 'e00db2472c9854080c4e2cd3cca7d226',
'./modules/Users/authentication/LDAPAuthenticate/LDAPConfigs/default.php' => 'e5c699efd1987e53c13b82f30bc1a13e',
@@ -1312,18 +1313,18 @@ $md5_string = array (
'./modules/Users/authentication/AuthenticationController.php' => 'aaf8b1b02587242110c14e247fda5c1e',
'./modules/Users/UserSignatureEditView.html' => '892d745adb145d74bde512c71e30732c',
'./modules/Users/UserSignature.php' => '23592719467cc4e04be189c6fa2d30db',
- './modules/Users/User.php' => 'bc338ef49103d7c67b66bbc3a0f80d54',
+ './modules/Users/User.php' => '2ea74cca9333c2d56c500ff768a71077',
'./modules/Users/SetTimezone.tpl' => 'f76851063b5129bcae41e7bef962636f',
'./modules/Users/SetTimezone.php' => '2fc96607e206886451fb5fe55f5526fd',
'./modules/Users/SaveTimezone.php' => 'c12559f852fb8d89a269814e808dadc5',
'./modules/Users/SaveSignature.php' => '2f8bfdb6f88dce867100a761366d0391',
- './modules/Users/Save.php' => '05457e848e9ab2d56b2625e4ea785842',
+ './modules/Users/Save.php' => '0bce18dac108a3aa3518f5fcae8b9d0a',
'./modules/Users/Popup_picker.html' => '9726cf3ff17bd5765191666f6460dfa1',
'./modules/Users/Popup_Users_picker.html' => '67411ba406dc06c63dc1b9eca6e55eca',
'./modules/Users/PopupUsers.php' => '5da32a565d9639eb42ab47e2d3330c08',
'./modules/Users/PopupSignature.php' => 'd9c4749eea3254af4bbef1d83736309c',
'./modules/Users/PasswordRequirementBox.css' => '57efa45544952eead6155719254e03c1',
- './modules/Users/Menu.php' => '4fbadfe11372f974fe015dcd7cd457df',
+ './modules/Users/Menu.php' => '6e9d3948eb98bae4194a0a6544834165',
'./modules/Users/Logout.php' => '5c819754b90e62e2f1739971144b01a6',
'./modules/Users/Login.php' => '18a89cfecf8e050a14f2586b05081548',
'./modules/Users/ListRoles.php' => '9833b76bd6bd4889285b4b4a6b933849',
@@ -1331,9 +1332,9 @@ $md5_string = array (
'./modules/Users/Forms.php' => '90b591c94157299485166b686f6a977d',
'./modules/Users/Error.php' => '62f9d5788e4663b84e030c4eaba3e8b3',
'./modules/Users/EditView.tpl' => '3f17c8379f1dedbd64b32e481cd56b9f',
- './modules/Users/EditView.php' => '8b312e26c12b250d280b2fbc51640bab',
+ './modules/Users/EditView.php' => 'fc3a145f61c7b4c7dfcc3338672a2ae8',
'./modules/Users/DetailView.tpl' => '8606bcec7d757a75345aff8f8bf86a0a',
- './modules/Users/DetailView.php' => '63dbf91d90bb3cb5b40bfb4002f46e3d',
+ './modules/Users/DetailView.php' => '3f8ee5e2c1c4f99e8e7ee01141f95cf5',
'./modules/Users/Changenewpassword.tpl' => '65a02130fbb6caabd2b662ca70bae9fd',
'./modules/Users/Changenewpassword.php' => '80cd1b05144aecdc382d9e50ec7efb1a',
'./modules/Users/ChangePassword.php' => 'e4161c571295ad4635ff66ff5e4cfc7b',
@@ -1345,7 +1346,7 @@ $md5_string = array (
'./modules/UserPreferences/controller.php' => '6022bf66d58876257bf96523b5c01953',
'./modules/UserPreferences/UserPreference.php' => '28ada4d1638677de694ec517fde20791',
'./modules/UpgradeWizard/upgradeWizard.js' => 'e2a4a2d4eec48a78c4c497e95d3b391b',
- './modules/UpgradeWizard/uw_utils.php' => '4f3f9614e27e5416fa4cdc38ca425218',
+ './modules/UpgradeWizard/uw_utils.php' => 'c5ab7f8e6169c1f1d7a515a51932c8fa',
'./modules/UpgradeWizard/uw_main.tpl' => '898039c49451aefbef0bfdece6c43f3b',
'./modules/UpgradeWizard/uw_files.php' => '0b16b9d7181ac363d19aa43b8c50090b',
'./modules/UpgradeWizard/uw_emptyFunctions.php' => 'fc09ce5db1b1aacd792140ceadc9ccd2',
@@ -1357,22 +1358,22 @@ $md5_string = array (
'./modules/UpgradeWizard/systemCheckJson.php' => 'ff48d6c123ea4c15c6887b2fdd765be0',
'./modules/UpgradeWizard/systemCheck.php' => '8f3109befa71e411d4bf898bd684ddb9',
'./modules/UpgradeWizard/start.php' => '339714f45395246c6f2ed68dc6b3e9b8',
- './modules/UpgradeWizard/silentUpgrade_step2.php' => 'a2953de599513c6804080408d4cd7266',
- './modules/UpgradeWizard/silentUpgrade_step1.php' => '99e3088421c64c862d9b8b2b64c2a0cb',
- './modules/UpgradeWizard/silentUpgrade_dce_step2.php' => '88d892134b9e6617c48ef91fdc9ea9e2',
- './modules/UpgradeWizard/silentUpgrade_dce_step1.php' => 'ed4d1e69ff57f47e5646aeff91ef1dae',
- './modules/UpgradeWizard/silentUpgrade.php' => '844751e09ff84620a7cfd82ae9b347ac',
+ './modules/UpgradeWizard/silentUpgrade_step2.php' => 'f1e4729f64aeb66fab829fe589400ece',
+ './modules/UpgradeWizard/silentUpgrade_step1.php' => '35ba042c4ac10a44b91f3e6a994f4bfe',
+ './modules/UpgradeWizard/silentUpgrade_dce_step2.php' => '40060f08c625546f424f15c82c884f1b',
+ './modules/UpgradeWizard/silentUpgrade_dce_step1.php' => '25784884d8a4b7babca2c8844f03e960',
+ './modules/UpgradeWizard/silentUpgrade.php' => 'a41bbf9eeead4b0cd6fe3ea9a219cc9e',
'./modules/UpgradeWizard/processing.gif' => 'd7c43fc19181ee59862601bfce100b41',
'./modules/UpgradeWizard/preflightJson.php' => '9d6c984b429ec12cd2ba47a34d899e35',
- './modules/UpgradeWizard/preflight.php' => 'd27bb989840a31ce093e11b8a1d49d7a',
+ './modules/UpgradeWizard/preflight.php' => '3384b1b92620d67468618d29e61532e8',
'./modules/UpgradeWizard/populateColumns.php' => '7c58ba862c5391857d059e75051b5cec',
'./modules/UpgradeWizard/layouts.php' => '8b414946612a3ac003e246c5356d1e44',
'./modules/UpgradeWizard/language/en_us.lang.php' => 'e7d9e12a3a829548a3c1ed260bb14624',
'./modules/UpgradeWizard/index.php' => '0732f50b02de0f8f9cb0cf0893c4bf5a',
- './modules/UpgradeWizard/end.php' => '820bc4d5b2457cec61da7afd8d72ef74',
+ './modules/UpgradeWizard/end.php' => '7650857e626b6fba0afd8114b5c46b2c',
'./modules/UpgradeWizard/deleteCache.php' => '2243700008a8b513b69f009e8c6dbcf8',
'./modules/UpgradeWizard/commitJson.php' => '3ac93b7343984a726d004499c53b315b',
- './modules/UpgradeWizard/commit.php' => 'd89aa3460a04eb2bdafe98f5dd2c3400',
+ './modules/UpgradeWizard/commit.php' => 'b12af2d5c23fdf23379af2032a37a065',
'./modules/UpgradeWizard/cancel.php' => 'e0b5196ee60b18d6a2876b96f16eda74',
'./modules/UpgradeWizard/UploadFileCheck.php' => 'd4a88e3b6923cf3365fedbf501116dd6',
'./modules/UpgradeWizard/SugarMerge/SugarMerge.php' => 'ed5f03dd65e4a51843e22a9f79e3b930',
@@ -1380,12 +1381,12 @@ $md5_string = array (
'./modules/UpgradeWizard/SugarMerge/SearchMerge.php' => 'b099bdd2790206068e8995ef773f3965',
'./modules/UpgradeWizard/SugarMerge/QuickCreateMerge.php' => 'af1531fec4a61fb3834a3d4090319aa4',
'./modules/UpgradeWizard/SugarMerge/ListViewMerge.php' => 'a1f8b9f7837affdcda70f2224403ac99',
- './modules/UpgradeWizard/SugarMerge/EditViewMerge.php' => 'b74bf89a9a347e95da5158855b54dab3',
+ './modules/UpgradeWizard/SugarMerge/EditViewMerge.php' => '89b4a1de7c270736d3f3405a9dd6db94',
'./modules/UpgradeWizard/SugarMerge/DetailViewMerge.php' => 'b9b16672b6e7f22e6e1899187409d65b',
'./modules/UpgradeWizard/SILENTUPGRADE.txt' => 'b47a5fe95eb81ed4b97d238283adc60d',
'./modules/UpgradeWizard/Menu.php' => '7b9b594383354f8d4900954d04536b18',
'./modules/Trackers/vardefs.php' => '0d727a4b31a2f34e133f9b6e32ea6a74',
- './modules/Trackers/store/TrackerSessionsDatabaseStore.php' => 'bbe9568bcdc168a4a1e27bfe30330ff9',
+ './modules/Trackers/store/TrackerSessionsDatabaseStore.php' => '25ea950fa31c88f5af4c119b0d229c54',
'./modules/Trackers/store/TrackerQueriesDatabaseStore.php' => 'bdf296977265dcdaab4c2e2cc77828ef',
'./modules/Trackers/store/SugarLogStore.php' => 'a3feecc0fb2a31e58896971fceabe67c',
'./modules/Trackers/store/Store.php' => 'def825fa5e38cc20539adf0651b30d16',
@@ -1513,7 +1514,7 @@ $md5_string = array (
'./modules/SavedSearch/SearchForm.html' => 'b459847986a5a78033744d2ac2fd83b8',
'./modules/SavedSearch/SavedSearchSelects.tpl' => 'c39f005f3f1456d0c403e7b1b5c29aec',
'./modules/SavedSearch/SavedSearchForm.tpl' => 'e1b30f7f970a53e8fbdf59c56594992a',
- './modules/SavedSearch/SavedSearch.php' => 'd176b45952dbff3eecdc79f716636429',
+ './modules/SavedSearch/SavedSearch.php' => '3c9f173dd0744e0b74115bb547f62dca',
'./modules/SavedSearch/Menu.php' => 'dc4c7a6e251fafed9e02fdedeadb6de1',
'./modules/SavedSearch/ListView.php' => '2a0fb2b9472a48ec7562f72d423ae925',
'./modules/Roles/views/view.list.php' => '1fa66e2cc62b833309892227d4cd64bb',
@@ -1575,7 +1576,7 @@ $md5_string = array (
'./modules/Prospects/field_arrays.php' => '11752a64ced2fe06cca0b7da2bd5e42b',
'./modules/Prospects/Save.php' => '94ea92c9bdbc15f131ea76deb1f5c05d',
'./modules/Prospects/ProspectFormBase.php' => '72b52d25d6cec57f62aeb5b22a2f1d11',
- './modules/Prospects/Prospect.php' => '4f9ae27c334b6aadf964412260d822dd',
+ './modules/Prospects/Prospect.php' => '82e124f5609d2e95675b5e7abcbd3d93',
'./modules/Prospects/Popup_picker.html' => '0595f82f557502878ce1de67bef83a43',
'./modules/Prospects/Menu.php' => '954ee473c71bac08d294415f04816411',
'./modules/Prospects/Import.php' => '41811673320c34629e81991794d41215',
@@ -1742,7 +1743,7 @@ $md5_string = array (
'./modules/Notes/Menu.php' => '9048d5be4a279901fb6e7b6120b58af9',
'./modules/MySettings/language/en_us.lang.php' => '562f4a6065b8ae50ee724823f5738043',
'./modules/MySettings/TabController.php' => 'addcc612e2526020690c888df738dd5d',
- './modules/MySettings/StoreQuery.php' => 'fd6c9363fa044c74c42a3f7e5927cb81',
+ './modules/MySettings/StoreQuery.php' => '705d71936244a25ea8343d71883fda0b',
'./modules/MySettings/LoadTabSubpanels.php' => '39a5244484198d37e9bd593d45344706',
'./modules/ModuleBuilder/views/view.wizard.php' => 'daf80d56024091c60f7e444d44f27b00',
'./modules/ModuleBuilder/views/view.tree.php' => 'b10035efb0b45ec6f31bf45a50374c3d',
@@ -1754,9 +1755,9 @@ $md5_string = array (
'./modules/ModuleBuilder/views/view.popupview.php' => '3acdfeeaa6ec776168cea15cb46425a2',
'./modules/ModuleBuilder/views/view.package.php' => 'a9379092526c7f53b95290712153d32e',
'./modules/ModuleBuilder/views/view.modulelabels.php' => '946ac2cafcfcac5d20265ffab8f0805a',
- './modules/ModuleBuilder/views/view.modulefields.php' => 'c668c2f284efd6ed73011be9b8770b1b',
+ './modules/ModuleBuilder/views/view.modulefields.php' => '13771ba7d654c9e7ad9c38e85235a562',
'./modules/ModuleBuilder/views/view.modulefield.php' => '6849d83c2f8a07a30c6bc2f6a79aefcf',
- './modules/ModuleBuilder/views/view.module.php' => '5cb5a568183ae3d91f09a0590b78798b',
+ './modules/ModuleBuilder/views/view.module.php' => 'e87f77f4bb936006ad94103cd0f1c453',
'./modules/ModuleBuilder/views/view.main.php' => '88123a5ca806fadac53f609b09959e25',
'./modules/ModuleBuilder/views/view.listview.php' => 'dc91490cc2381300c65ec6cc6f45e2b6',
'./modules/ModuleBuilder/views/view.layoutview.php' => '8924b7ed186d75872c6cf061bc5e2fe1',
@@ -1855,12 +1856,12 @@ $md5_string = array (
'./modules/ModuleBuilder/javascript/SimpleList.js' => 'd9d7ce9e36b6c72800a0e35bd2b65c2d',
'./modules/ModuleBuilder/javascript/ModuleBuilder.js' => '2edabc112129c6a57b8f2a550ab847c5',
'./modules/ModuleBuilder/javascript/JSTransaction.js' => '2f20a4a72eaa8cbdf3053e24c5772ee5',
- './modules/ModuleBuilder/controller.php' => '54078e5cfee491cc3b2e0e6b31f7a9ce',
+ './modules/ModuleBuilder/controller.php' => '515759fb7c30a70b5f1250ba1eea4e1b',
'./modules/ModuleBuilder/action_view_map.php' => 'fd1e0b87f5d325f06b2b743afa057999',
'./modules/ModuleBuilder/Module/StudioTree.php' => 'e29fed9b1f81766bda975d938eecd3ec',
'./modules/ModuleBuilder/Module/StudioModuleFactory.php' => '5860a0e60d39a69303a39df4ea188336',
'./modules/ModuleBuilder/Module/StudioModule.php' => '2874e799f025ab3afcc40c5a0f15ea69',
- './modules/ModuleBuilder/Module/StudioBrowser.php' => 'ed7b9fc9c4750c6574335a3c4ee462af',
+ './modules/ModuleBuilder/Module/StudioBrowser.php' => 'a12897d3293acd37f50cff6663e1ca47',
'./modules/ModuleBuilder/Module/MainTree.php' => '43824a340ebbce175fac3b60b7641efb',
'./modules/ModuleBuilder/Module/DropDownTree.php' => 'ab1f94e57c7ec0f1f2b0a37fa158eab5',
'./modules/ModuleBuilder/Module/DropDownBrowser.php' => '7cd759094f2018b86eb030b2f6286516',
@@ -1999,7 +2000,7 @@ $md5_string = array (
'./modules/LabelEditor/EditView.html' => '5c869e234bee20cc12984742cdea69c3',
'./modules/InboundEmail/InboundEmail.js' => 'd24d7238fd7f1c7f2f41b25480d09f2e',
'./modules/InboundEmail/vardefs.php' => 'f7aa1b4be9efb3918e9565b85f8ee55c',
- './modules/InboundEmail/language/en_us.lang.php' => 'dd04eefc166e76e1723200fe6b8ea959',
+ './modules/InboundEmail/language/en_us.lang.php' => '39b2d83673f787eb77be842dd8d972b4',
'./modules/InboundEmail/index.php' => '1aa418a33d81f3df849d7d7234438c2a',
'./modules/InboundEmail/field_arrays.php' => '7ef33a5b89e97313772104505043fff0',
'./modules/InboundEmail/View.html' => '42dfabb40c585bf030af5885704ba056',
@@ -2012,16 +2013,17 @@ $md5_string = array (
'./modules/InboundEmail/ListView.html' => '7e5d8d426d0a6833fe5caa3fb3ccc471',
'./modules/InboundEmail/InboundEmailTest.php' => '702038f3171c1bb612d4fff7cf0f765e',
'./modules/InboundEmail/InboundEmail.php' => '963ae74afe37e2eed60fc957de7d5a1a',
- './modules/InboundEmail/EditView.php' => '39494fbc1ed66123f89480c8f766238c',
- './modules/InboundEmail/EditView.html' => 'c07edc17593ceec76bc4521cc98f4e13',
+ './modules/InboundEmail/EditView.php' => 'aef594532aa6ab776c4b3cc30b20a04d',
+ './modules/InboundEmail/EditView.html' => '7252f37c5372a5dd9989c212728cca98',
'./modules/InboundEmail/EditGroupFolder.php' => '6c6ba0d835901e8e9a8e87056d0479b6',
'./modules/InboundEmail/DetailView.php' => 'f838087f2c73b83a2deee755475be859',
'./modules/InboundEmail/DetailView.html' => '065eb0891ad5444b24a6b9d38740b8eb',
'./modules/InboundEmail/Delete.php' => '682ed772ec388482dbe7a599e9e56104',
+ './modules/Import/ImportMapTab.php' => 'd179a9e67a3bbc6e8b408efd2e37252a',
'./modules/Import/views/view.undo.php' => 'f3eed66ae73427bab843bc3c4d429db0',
- './modules/Import/views/view.step4.php' => 'e616048ba95212623d985251ce8e4650',
+ './modules/Import/views/view.step4.php' => 'a5f6fd30495e02bfdbd000c2abfe5062',
'./modules/Import/views/view.step3.php' => '37847270b3445e2254096b3e4c9385fb',
- './modules/Import/views/view.step2.php' => '731505745703aba5be0d0b03821d4cbd',
+ './modules/Import/views/view.step2.php' => '1836dd43ff036bf2396110df4a50eac2',
'./modules/Import/views/view.step1.php' => '997520f56e4ce49a625771a5d9a40ba2',
'./modules/Import/views/view.last.php' => 'a1c30d3cf0c21343cc03c856a8d2911a',
'./modules/Import/views/view.error.php' => '4a9ef123c90511298bac72b55405f2f1',
@@ -2033,16 +2035,15 @@ $md5_string = array (
'./modules/Import/tpls/last.tpl' => '84bb779c391262ad2fbb41a38e50cbd6',
'./modules/Import/tpls/error.tpl' => '8bfbddd3c2424d4a1b3670bd79c88e16',
'./modules/Import/language/en_us.lang.php' => '2e3bb401c11dc3f8cdc5a571c1f17ec1',
- './modules/Import/controller.php' => 'ce46636408b245c321012387da2a1882',
- './modules/Import/UsersLastImport.php' => '2dae79ebe11ad6e559407bc79e47b8a2',
- './modules/Import/Menu.php' => '923e16d2066f8577f847d2db148cd7ab',
- './modules/Import/ImportMapTab.php' => 'd179a9e67a3bbc6e8b408efd2e37252a',
'./modules/Import/ImportMapSalesforce.php' => 'd87705fc0ed0797d73ee77c9d1d985cf',
+ './modules/Import/Menu.php' => '923e16d2066f8577f847d2db148cd7ab',
'./modules/Import/ImportMapOutlook.php' => 'e6887afa92b5d94670fb926edef4c052',
'./modules/Import/ImportMapOther.php' => 'bd5d670a97dc6fe345b4b13b276850e2',
'./modules/Import/ImportMapCsv.php' => 'b20f78374b2b5eb218a822627663502a',
'./modules/Import/ImportMapAct.php' => 'bef724cdef346231a6063ae4b4578f83',
'./modules/Import/ImportMap.php' => '18681e9eb3f1b34ce7b2ec9b6af1f89e',
+ './modules/Import/controller.php' => 'ce46636408b245c321012387da2a1882',
+ './modules/Import/UsersLastImport.php' => '2dae79ebe11ad6e559407bc79e47b8a2',
'./modules/Import/ImportFileSplitter.php' => 'f64c6d4e292c45f4d806da5d2300d14f',
'./modules/Import/ImportFile.php' => '0cff4a5dbe28838cccdc68d1ef5a0920',
'./modules/Import/ImportFieldSanitize.php' => 'da057b84f590f3cca5a82118f6b936d7',
@@ -2056,7 +2057,7 @@ $md5_string = array (
'./modules/Home/views/view.list.php' => 'b1213448edbef90a40061dbdfb6e432c',
'./modules/Home/sitemap.tpl' => 'a0145732b2b2154506eae54e3b66b851',
'./modules/Home/sitemap.php' => '85d1da921c719667f1e1be77993101d6',
- './modules/Home/quicksearchQuery.php' => 'ac06becb08d8dc6bdd3354c91f9717fc',
+ './modules/Home/quicksearchQuery.php' => 'f6ecc927b4122a53ac3a4bcf12c033ee',
'./modules/Home/language/en_us.lang.php' => '22af00cddc27f7519807f2222d9d8232',
'./modules/Home/dashlets.php' => 'a88f1d512af748e1a4aa34bfdb34f883',
'./modules/Home/UnifiedSearchAdvancedResults.tpl' => '65b6695a4b79dff0c7564665ac45355f',
@@ -2130,9 +2131,9 @@ $md5_string = array (
'./modules/Groups/DetailView.html' => '0c0c957f384c3a1f30f52922afd517bd',
'./modules/Groups/Delete.php' => '62a025db67afb0688f26ac1dd2e6b855',
'./modules/Employees/EmployeeStatus.php' => 'e15246545f162fbb5ea4126eae907d7f',
- './modules/Employees/views/view.list.php' => '0210785381987f093302c6a67319dc07',
+ './modules/Employees/views/view.list.php' => 'bdd83c70f40f420ab30a782cbcc627c3',
'./modules/Employees/views/view.edit.php' => 'a5838c257968be170c2bf2e26990adde',
- './modules/Employees/views/view.detail.php' => 'c0d92fe69d7afb125c46b96a7d26a310',
+ './modules/Employees/views/view.detail.php' => 'b24de9fc3e8af418f83e058cec016959',
'./modules/Employees/vardefs.php' => 'fbc0faa3310c46fda6e9022793b4173d',
'./modules/Employees/metadata/searchdefs.php' => 'b88ed48339d529934d31e521577a3995',
'./modules/Employees/metadata/listviewdefs.php' => 'ebe83948298f79b75a68b6c39b013ff6',
@@ -2141,7 +2142,7 @@ $md5_string = array (
'./modules/Employees/metadata/SearchFields.php' => '69ebebc849e2452547d2266fed1a0fa3',
'./modules/Employees/language/en_us.lang.php' => '1f17b3edd6306243cf5aff4a87d91058',
'./modules/Employees/field_arrays.php' => '33d547bb2ed38acc854cf06668f0c1f6',
- './modules/Employees/controller.php' => '4a078d0495226c3fb27c1952de12ddb6',
+ './modules/Employees/controller.php' => '8320ea0e849226757cb3cd949788e3a1',
'./modules/Employees/WapMenu.php' => '6ef9a223b1a105fa943802999a172ecb',
'./modules/Employees/WapAuthenticate.php' => '08d96a367d015300294ea70bd459b6a3',
'./modules/Employees/Popup_picker.php' => '8997f25d9d63236bb09e2fa58dcbca4e',
@@ -2250,7 +2251,7 @@ $md5_string = array (
'./modules/Emails/GenerateQuickComposeFrame.php' => '9fa2162d2750f8dbc20a705909c353b3',
'./modules/Emails/EmailUIAjax.php' => '430e12675d05a6bb49a4111378dad759',
'./modules/Emails/EmailUI.php' => '4a84724f5f101fcd4e9f2e5a4ba360e5',
- './modules/Emails/EmailUI.css' => '671856ced58b300fa264fe6ddee958fb',
+ './modules/Emails/EmailUI.css' => '6f93388627148bdc54c9458c434d7ec1',
'./modules/Emails/Email.php' => 'f5d67b0049592d97428c75cc6f9d6ecd',
'./modules/Emails/EditViewArchive.html' => '9e4738577440967b28e60bb2d35b625a',
'./modules/Emails/EditView.php' => 'bbf3c6d659a6cb696cabe233db2bd313',
@@ -2302,6 +2303,7 @@ $md5_string = array (
'./modules/EmailMarketing/DetailView.php' => '34354f70fb63917246723f3ca728eeb4',
'./modules/EmailMarketing/DetailView.html' => 'fa059c2dc675788d4afb9b7b1e61dbfa',
'./modules/EmailMarketing/Delete.php' => 'c086cb4ea3c7c61a9feb8e9ff7037aab',
+ './modules/EmailMan/EmailImage.php' => 'a31ccf962c840f3c613fac8cd397cf86',
'./modules/EmailMan/views/view.list.php' => 'd5de096088dccaf7dae5527489ab5825',
'./modules/EmailMan/views/view.config.php' => '57b38635350c47bd0fe995348d940c9b',
'./modules/EmailMan/views/view.campaignconfig.php' => '929db4bba124ff947bc67ee3599341c6',
@@ -2396,7 +2398,7 @@ $md5_string = array (
'./modules/DynamicFields/FieldsMetaData.php' => '31881094e9dfef9a0579622e0768d69f',
'./modules/DynamicFields/FieldViewer.php' => '53f662eab9401fd5a0b9f90c035fb13a',
'./modules/DynamicFields/FieldCases.php' => '7e9c75d4fcefca29f24033a0e8687f3c',
- './modules/DynamicFields/DynamicField.php' => 'cf3ccf07934f613364c6dc8bf1ade3a5',
+ './modules/DynamicFields/DynamicField.php' => 'bfda5665bdc3c864673509536b548611',
'./modules/Documents/documents.js' => 'bd75e795c1821436c484e01ac09a95d1',
'./modules/Documents/tpls/view.extdoc.tpl' => '5566d78f1a66a4a38d1d3dc93ece9c01',
'./modules/Documents/action_view_map.php' => '0994fe5e38b73c985fff200f9edb2129',
@@ -2408,7 +2410,7 @@ $md5_string = array (
'./modules/Documents/Dashlets/MyDocumentsDashlet/MyDocumentsDashlet.meta.php' => '0fd71adbdb97e05acfa9e37f517fd47b',
'./modules/Documents/Dashlets/MyDocumentsDashlet/MyDocumentsDashlet.data.php' => '3842f658a0da2ca0f18564e6f7683bcd',
'./modules/Documents/vardefs.php' => '33fa2c9c8bd1f96fff4374b2142bf671',
- './modules/Documents/metadata/subpanels/default.php' => '5b6be1a74979453da3aca0fdc1a8b713',
+ './modules/Documents/metadata/subpanels/default.php' => '094a811736e4674863bd5c832dd5730d',
'./modules/Documents/metadata/subpanels/ForContractType.php' => '1aa63508fbea18bbf6ccfaad4bb4737a',
'./modules/Documents/metadata/subpaneldefs.php' => '70dd233ce8f24edeb4b54a39185d5562',
'./modules/Documents/metadata/studio.php' => '1f3e1f9c3a457e502635fd5a1d53861d',
@@ -2481,7 +2483,7 @@ $md5_string = array (
'./modules/Contacts/metadata/metafiles.php' => 'fc6c9afb233d2b11c5594c9cd90308a1',
'./modules/Contacts/metadata/listviewdefs.php' => 'ff21ec25012045a06895707c9b7ed97a',
'./modules/Contacts/metadata/editviewdefs.php' => 'e28d1eb0d5b947573ecef501dae48892',
- './modules/Contacts/metadata/detailviewdefs.php' => '373fecbb32ab8f99c6886832629bf925',
+ './modules/Contacts/metadata/detailviewdefs.php' => 'f485ac2da169d06a8a407b6ad22f3354',
'./modules/Contacts/metadata/additionalDetails.php' => 'db6c2236740f97bfc8c341fa3da79dbc',
'./modules/Contacts/metadata/SearchFields.php' => '48c393c28326b6516e60380afa97e5c6',
'./modules/Contacts/language/en_us.lang.php' => '1dd9782ef94980ee09bbb21ec2b50414',
@@ -2505,7 +2507,7 @@ $md5_string = array (
'./modules/Contacts/ContactOpportunityRelationshipEdit.html' => '063f65d9dbe6f7f58367d99f2af65210',
'./modules/Contacts/ContactOpportunityRelationship.php' => 'ec6fac16e09199dc26550e84cca523cf',
'./modules/Contacts/ContactFormBase.php' => '0c0bf18973d25a15dd66bcca256112a7',
- './modules/Contacts/Contact.php' => '48678801965d3ce52402f0405c5ee566',
+ './modules/Contacts/Contact.php' => 'b66ed57efe60e3774f09e25ca8ffc997',
'./modules/Contacts/BusinessCard.php' => '6791cfe02546533166a04d27d143eb49',
'./modules/Contacts/BusinessCard.html' => '2ad1f1578e7c6f85791f97656576a3a8',
'./modules/Contacts/Address_picker.html' => '7d072ff9f9bc06d2373ba2dee5a7086c',
@@ -2513,12 +2515,12 @@ $md5_string = array (
'./modules/Connectors/Connector.js' => '41a0de3b7ffd5ab14b582a387a91d709',
'./modules/Connectors/views/view.sourceproperties.php' => '7997c47e9b4b16a4110d74cefd49e876',
'./modules/Connectors/views/view.searchproperties.php' => '5babafe11d6938e40743e8309949bc9b',
- './modules/Connectors/views/view.modifysearch.php' => 'c9b1cfca896ed2004015dc9ae6f9ed4a',
- './modules/Connectors/views/view.modifyproperties.php' => '0486454214e934686902d95068a7d9de',
- './modules/Connectors/views/view.modifymapping.php' => '752df2ba9ae4155de142af971cfbb1c6',
- './modules/Connectors/views/view.modifydisplay.php' => '91db631f22c797e1fc081f6e4a1bb705',
+ './modules/Connectors/views/view.modifysearch.php' => '6d780a252feacfec34763b6aa82023a7',
+ './modules/Connectors/views/view.modifyproperties.php' => 'dcc0b716091162d4c0bd2358cc36c75e',
+ './modules/Connectors/views/view.modifymapping.php' => 'f6e46213597c80cf956d096a2b7eff07',
+ './modules/Connectors/views/view.modifydisplay.php' => 'f0214caab2b1f11eeaa0061b7f5c5479',
'./modules/Connectors/views/view.mappingproperties.php' => '709b7978381a3d4559574aef3035f08b',
- './modules/Connectors/views/view.displayproperties.php' => 'bb8252ddbabe8ecf9dce745eecef0ec6',
+ './modules/Connectors/views/view.displayproperties.php' => '34fbb12f5fbf89bc4320b8d5fa8e6157',
'./modules/Connectors/views/view.connectorsettings.php' => '4a73c3d0a244650188fbb5028b8d15dd',
'./modules/Connectors/tpls/tabs.css' => 'b69adf86332cf9ef4dcec4af9b9867cd',
'./modules/Connectors/tpls/source_properties.tpl' => '4e474ab4f798b0cabc9f3a224a6bece6',
@@ -2534,7 +2536,17 @@ $md5_string = array (
'./modules/Connectors/tpls/administration.tpl' => '08c82fb2efe9da0793e676ba61cfd4da',
'./modules/Connectors/metadata/searchdefs.php' => '0a7b0c3175045ed95ffba4266f5aa88c',
'./modules/Connectors/language/en_us.lang.php' => '7a098f6e82147b7f1b78548c73e6396d',
- './modules/Connectors/controller.php' => '22fbb51484589e797e7a6f028f506fc9',
+ './modules/Connectors/controller.php' => '6a2d3a3e77f9ea5215c829be7d293c3e',
+ './modules/Connectors/connectors/sources/ext/rest/insideview/mapping.php' => '0a0fac88d087b82df90c60abc0945819',
+ './modules/Connectors/connectors/sources/ext/rest/insideview/insideview.php' => 'a0707499398c3cf58c9fbaa45a93e85d',
+ './modules/Connectors/connectors/sources/ext/rest/insideview/images/video.png' => '78914852af51eb8eb694fdcf518b6752',
+ './modules/Connectors/connectors/sources/ext/rest/insideview/images/insideview_expanded.png' => 'db7e5e84b7891adaed90dfd211338959',
+ './modules/Connectors/connectors/sources/ext/rest/insideview/images/insideview_collapsed.png' => 'dc728b8cb2023847a28eb54a06c4d78e',
+ './modules/Connectors/connectors/sources/ext/rest/insideview/images/insideview.png' => 'b94d9483f486e0f53b3d98c6d04bd9f6',
+ './modules/Connectors/connectors/sources/ext/rest/insideview/images/close.png' => 'a0d9ad4fc0c4a58ebaa7823216f6cc98',
+ './modules/Connectors/connectors/sources/ext/rest/insideview/config.php' => 'a5d091ae0399b08a109fb26ec6d602f7',
+ './modules/Connectors/connectors/sources/ext/rest/insideview/InsideViewLogicHook.php' => '6897ce047b1ce6d1a163cb6845e3a106',
+ './modules/Connectors/connectors/sources/ext/rest/insideview/InsideView.en_us.tpl' => '7dfe61487b357f007a1792b541def89b',
'./modules/Connectors/connectors/sources/ext/rest/linkedin/vardefs.php' => '975b74882adf5d355985d903f60fc160',
'./modules/Connectors/connectors/sources/ext/rest/linkedin/mapping.php' => '03dbda444c28146c4def211d46778dbc',
'./modules/Connectors/connectors/sources/ext/rest/linkedin/linkedin.php' => 'd5da6d5b0b11082807ee53fd3eafbed3',
@@ -2546,7 +2558,7 @@ $md5_string = array (
'./modules/Connectors/connectors/formatters/ext/rest/linkedin/linkedin.php' => 'afa27c177dd2d7d04b4a5f77695cde8b',
'./modules/Connectors/action_view_map.php' => '66adc06bd72b68a55b8fb8d6dee103d8',
'./modules/Connectors/Menu.php' => '555fcfc5228dc346b01e69fc1779bb8a',
- './modules/Connectors/InstallDefaultConnectors.php' => '6429abb1f241b93a96c868d23935aae5',
+ './modules/Connectors/InstallDefaultConnectors.php' => '9b717d3d2fcc49336f880fa84d46a2a4',
'./modules/Connectors/Forms.php' => '2a94c4a8f697121796f53413911131f6',
'./modules/Connectors/ConnectorRecord.php' => '452d382859384f44b912abd25f727268',
'./modules/Configurator/views/view.sugarpdfsettings.php' => 'dc1f025773e789eb3960bed66382b4ac',
@@ -2689,7 +2701,7 @@ $md5_string = array (
'./modules/Campaigns/WebToLeadCapture.php' => '78cdb91e816e94b1d7b4eeba8e3fcf78',
'./modules/Campaigns/Tracker.php' => '726e6fc5b58f58cd4b330b61a12d7d21',
'./modules/Campaigns/TrackDetailView.tpl' => '3187e57b3476ef4387e76b385893027d',
- './modules/Campaigns/TrackDetailView.php' => 'd1b54e37c5cfdbce9f556298e78754c4',
+ './modules/Campaigns/TrackDetailView.php' => '4f3535618c1d37939b7e2775d25f1657',
'./modules/Campaigns/Subscriptions.tpl' => '1332be18f7e16a30887156e46430602a',
'./modules/Campaigns/Subscriptions.php' => 'dfb48508303fc1f68bff1a9c83b06a96',
'./modules/Campaigns/Subscriptions.html' => 'a597b43f0772858ca5ea18c6f19a9ea9',
@@ -2839,7 +2851,7 @@ $md5_string = array (
'./modules/Administration/repairUniSearch.php' => 'e25cdf52b928d0ea05e4a2b25acf8a66',
'./modules/Administration/repairSelectModule.php' => 'a7af51a5f7f6e5002f4963b80504c0d8',
'./modules/Administration/ncc_config.php' => '6fcf1f7bd93acbf9b0c7b3a890bdab9d',
- './modules/Administration/metadata/adminpaneldefs.php' => '5a2723947dbd9d4f7d9235ec78906f50',
+ './modules/Administration/metadata/adminpaneldefs.php' => 'ad3965327909144539e30ab90a646daa',
'./modules/Administration/metadata/SearchFields.php' => '6968a40d78da694e44829ec8d00645e8',
'./modules/Administration/language/en_us.lang.php' => '8bfda44a508c4eaa535372244f152343',
'./modules/Administration/javascript/Administration.js' => '17c40b0cafc373733b54c61945796313',
@@ -2914,10 +2926,10 @@ $md5_string = array (
'./modules/Activities/SubPanelView.php' => '7b656bdde855f8032edcfb640677d7a9',
'./modules/Activities/SubPanelView.html' => '74afed37ca1d19a2a67307e063b52c4e',
'./modules/Activities/SetAcceptStatus.php' => '42fcffc8717e7b1cb10001b137400d9e',
- './modules/Activities/Popup_picker.php' => 'c21ed67459a62113293a71f7b6c43611',
- './modules/Activities/Popup_picker.html' => '82fca068e687dbca227b0b4c8fc69b76',
'./modules/Activities/OpenListView.php' => '7e4b120b80f5d4dcc461ca1bc2e8fc54',
'./modules/Activities/OpenListView.html' => '1983c915fc02a41b01459b6923d7a0a5',
+ './modules/Activities/Popup_picker.php' => 'c21ed67459a62113293a71f7b6c43611',
+ './modules/Activities/Popup_picker.html' => '82fca068e687dbca227b0b4c8fc69b76',
'./modules/Activities/Menu.php' => '50ace4d08c7af062a3da92e52e6ebffc',
'./modules/Activities/Forms.php' => 'd7472639650199c74c40ba981f008c2c',
'./modules/Accounts/Account.js' => 'f36d341901d749c3e43e334d5a550f01',
@@ -2955,7 +2967,7 @@ $md5_string = array (
'./modules/Accounts/AccountFormBase.php' => 'a80b0c9ebadf92b1451b2e90fe4d3146',
'./modules/Accounts/Account.php' => '685f3b6d7de771f7966ff99b40687d67',
'./modules/ACLRoles/ACLRoles.js' => '5366ba5c2f0203a5b212682a644020d2',
- './modules/ACLRoles/views/view.list.php' => '7db6710edc1dae3a172213516130805e',
+ './modules/ACLRoles/views/view.list.php' => 'e40ad40a14a03cf692dd279b9616329a',
'./modules/ACLRoles/vardefs.php' => 'f500232770683374295c4d6d721dd54c',
'./modules/ACLRoles/popup.tpl' => 'c76696fa8c1a9e0a18bfd95964bd34e7',
'./modules/ACLRoles/metadata/subpanels/default.php' => 'ae62c499811f290b3afd519359cb1e84',
@@ -2970,7 +2982,7 @@ $md5_string = array (
'./modules/ACLRoles/Popup_picker.php' => '40caf8381d5895522cc4498241e463d9',
'./modules/ACLRoles/Popup_picker.html' => '97ba9cc4e5d8112f4b34560ed80af8d7',
'./modules/ACLRoles/Menu.php' => 'aff1c642bf608488e3212b1822e6b464',
- './modules/ACLRoles/ListUsers.php' => '8943a5c310a76d435c88b1c55ab5ff72',
+ './modules/ACLRoles/ListUsers.php' => 'c56917db3d56b5500e3610907daa8cd5',
'./modules/ACLRoles/Forms.php' => 'd41d8cd98f00b204e9800998ecf8427e',
'./modules/ACLRoles/EditViewBody.tpl' => 'ef51be5f166d56af9524993cd4983d34',
'./modules/ACLRoles/EditView.tpl' => 'd98c51bc90139d35c6cb72acfe88127e',
@@ -2982,7 +2994,7 @@ $md5_string = array (
'./modules/ACLRoles/DetailViewBody.tpl' => 'a1dc057d0ac81f87ada4acf9dd1cbe55',
'./modules/ACLRoles/DetailView.tpl' => '975040e818f0231e25707a8473776af8',
'./modules/ACLRoles/DetailView.php' => 'e1e7fdda30ac3ec334aa03c620da0faf',
- './modules/ACLRoles/DetailUserRole.php' => '77b5c996e893286bdae907da3e7a2eee',
+ './modules/ACLRoles/DetailUserRole.php' => '042213d7e29e2920bf9f0f42babb14fb',
'./modules/ACLRoles/Delete.php' => 'f96a51d94ed64113248441e61913c47e',
'./modules/ACLRoles/ACLRole.php' => '777a7fbaca007322fdf5caaa21468a65',
'./modules/ACLActions/vardefs.php' => '105b4a9bc0de199ce7c6f7bed15ee783',
@@ -2991,7 +3003,7 @@ $md5_string = array (
'./modules/ACLActions/actiondefs.php' => '6356876a5a119274d46223f3e2bc4789',
'./modules/ACLActions/Menu.php' => '848677adce001bc11ce4a9776c71766f',
'./modules/ACLActions/Forms.php' => 'd41d8cd98f00b204e9800998ecf8427e',
- './modules/ACLActions/ACLAction.php' => '7db517b8a77747bb2746d3523dd2bc33',
+ './modules/ACLActions/ACLAction.php' => 'c5a4b74f755b0613b028496df3d5c840',
'./modules/ACL/vardefs.php' => '1a607a89f74d689dee7511441e9b5780',
'./modules/ACL/remove_actions.php' => 'e0d41de5bae0c25d1b96464945ccc611',
'./modules/ACL/metadata/subpaneldefs.php' => '828de1877beb0908c89bbd37b903b5bf',
@@ -3072,15 +3084,15 @@ $md5_string = array (
'./jssource/src_files/include/SubPanel/SubPanelTiles.js' => 'b65c9d967a27614395b6857edce04539',
'./jssource/src_files/include/SugarCharts/Jit/FlashCanvas/canvas2png.js' => '4c95a8c2071e0d5b4ae1531a790f1492',
'./jssource/src_files/include/SugarCharts/Jit/FlashCanvas/flashcanvas.js' => 'c06bd0d01f1daa8ee7c54b83fe33f03a',
- './jssource/src_files/include/SugarCharts/Jit/js/Jit/jit.js' => '85eb38c3295ddbd375a87ddb1f57de20',
- './jssource/src_files/include/SugarCharts/Jit/js/mySugarCharts.js' => '5a92afaea8135c89d7f397e7a83fe2b7',
- './jssource/src_files/include/SugarCharts/Jit/js/sugarCharts.js' => '9733290dde6930d2ac24cc4c1d74f325',
+ './jssource/src_files/include/SugarCharts/Jit/js/Jit/jit.js' => '6f27b1641c7d1d80182978bf4230e257',
+ './jssource/src_files/include/SugarCharts/Jit/js/mySugarCharts.js' => 'bbbca8b9bb44d0f107a2783fe1cf861d',
+ './jssource/src_files/include/SugarCharts/Jit/js/sugarCharts.js' => '72eba4ec918665ffa582c6fec16d2c78',
'./jssource/src_files/include/SugarDependentDropdown/javascript/SugarDependentDropdown.js' => '82905de42674faa12e819f99d3db0610',
'./jssource/src_files/include/SugarEmailAddress/SugarEmailAddress.js' => '80df53c11d7653e87488d48ce49e2b76',
'./jssource/src_files/include/SugarFields/Fields/Address/SugarFieldAddress.js' => '2e39ad35e6759c407fae5b35b230d34b',
- './jssource/src_files/include/SugarFields/Fields/Collection/SugarFieldCollection.js' => '05d54e9fd3f320f4e9d1c932fbf01f3d',
+ './jssource/src_files/include/SugarFields/Fields/Collection/SugarFieldCollection.js' => '46177c45fd308532d832212baaa64cd3',
'./jssource/src_files/include/SugarFields/Fields/Datetimecombo/Datetimecombo.js' => '7f93acedc02d390800eaad0e5fc22cae',
- './jssource/src_files/include/SugarFields/Fields/File/SugarFieldFile.js' => '1556040f15b77df8134127ed98909906',
+ './jssource/src_files/include/SugarFields/Fields/File/SugarFieldFile.js' => '15df601d523b6e06f6b71220c7ff12bd',
'./jssource/src_files/include/connectors/formatters/default/company_detail.js' => 'ac718b13fd22689d7da786dcb0b0380c',
'./jssource/src_files/include/javascript/cookie.js' => '4edb43519c5ac8c3d9b1b73b9ddf87fb',
'./jssource/src_files/include/javascript/dashlets.js' => 'c85774c7bcc3568d50e71448dbb371af',
@@ -3095,7 +3107,7 @@ $md5_string = array (
'./jssource/src_files/include/javascript/quickCompose.js' => 'c87742cdae04b75afc7e59c9e9440d39',
'./jssource/src_files/include/javascript/quicksearch.js' => '751e98b3b4c21b2585d3d706249c800b',
'./jssource/src_files/include/javascript/report_additionals.js' => '3f42310a202ae3779225ff29be91ea3b',
- './jssource/src_files/include/javascript/sugar_3.js' => 'c64dd62b371639fc96854a9ff09c9588',
+ './jssource/src_files/include/javascript/sugar_3.js' => 'ad171414b5b0c2fe2f04dce74e527657',
'./jssource/src_files/include/javascript/sugar_connection_event_listener.js' => 'd13aa0b553050db12f7bd6cd5b7b98f9',
'./jssource/src_files/include/javascript/sugarwidgets/SugarYUILoader.js' => '9237f12850b7ce5c27669480f71152be',
'./jssource/src_files/include/javascript/sugarwidgets/SugarYUIWidgets.js' => '7ebb592aa4b8c948b288d85de464ec7e',
@@ -3442,7 +3454,7 @@ $md5_string = array (
'./install/licensePrint.php' => 'f569be1d51e52d0067ec1b2845a4c9b1',
'./install/license.php' => 'b77114912cbd2dcb2ed7bd79364a2bcb',
'./install/language/en_us.lang.php' => '323d1171ae5e00d8abea20f864d80901',
- './install/performSetup.php' => '3d4dab1d275241eba09b2766bf8fa2e3',
+ './install/performSetup.php' => 'fa88a490b6344e1c93748a082dc9e3dc',
'./install/install_defaults.php' => '3c67b082c1709e909dd1aaf051e9c589',
'./install/installType.php' => '610e49880f0277ce2f7d4f92f43a5188',
'./install/installSystemCheck.php' => '5a838d917ba5bce6796a1650621bf936',
@@ -3451,7 +3463,7 @@ $md5_string = array (
'./install/install.css' => '862e23df1815d0138cf0a367d92a372d',
'./install/download_patches.php' => '5e368942a39067c98762efa043f3e30f',
'./install/download_modules.php' => '6d02fd07cfa964f47204b8f4b69efdd7',
- './install/install_utils.php' => 'fc7330ee05ef98d790ad528f61d47fe5',
+ './install/install_utils.php' => '458c1122a57a0b8bf56188844bef7567',
'./install/populateSeedData.php' => 'eff9d58196b49139ad94a4f79af810ab',
'./install/demoData.en_us.php' => 'ab6d0dc87a9f421e843ac454aec4546a',
'./install/dbConfig_a.php' => '2e20033c538c76a54f2aaeed13c42118',
@@ -3463,7 +3475,7 @@ $md5_string = array (
'./install/TeamDemoData.php' => '1cf512bcb6834cdac2c154b2f42d14cd',
'./index.php' => '85d2f32e8b794128592f116a91fcef72',
'./include/JSON.js' => '603ba7c5edab1ce11d7d1ab3fd98e808',
- './include/externalAPI/ExternalAPIFactory.php' => '1a04e3a0453152df9d6660539aae75c1',
+ './include/externalAPI/ExternalAPIFactory.php' => 'b94ed8c1a24578abe4e5b30f484ccfbe',
'./include/externalAPI/Base/WebMeeting.php' => '53cbdd0ac77fde2542711093c64f83b9',
'./include/externalAPI/Base/WebFeed.php' => '6ce8b5213a9f52991c30a9597686aa9a',
'./include/externalAPI/Base/WebDocument.php' => '728f703b0dd2bcf9845b033142532416',
@@ -3543,7 +3555,7 @@ $md5_string = array (
'./include/ytree/Node.php' => '537ea99369cc451f6d02e6ccd33c4eec',
'./include/ytree/ExtNode.php' => 'f4bcdda0640f5ad72e95835419b59435',
'./include/vCard.php' => '96cca0a297a8ecce67e0894b072b0793',
- './include/utils/php_zip_utils.php' => '5162320554d086e9fa3404aac87760c0',
+ './include/utils/php_zip_utils.php' => '776cdb257fd48ca212940f60687cd149',
'./include/utils/sugar_file_utils.php' => '5dbecfc86fec0dcd5c15d69c9c68758e',
'./include/utils/security_utils.php' => '5848837442f97823077e87a384e7e691',
'./include/utils/progress_bar_utils.php' => 'c38627c8c832e31a0f524151491efbb5',
@@ -3552,14 +3564,14 @@ $md5_string = array (
'./include/utils/layout_utils.php' => 'e7b465492ed76893b109e2baa31cabea',
'./include/utils/file_utils.php' => 'cd7b33adab01fd36d0953e40a336dffd',
'./include/utils/external_cache.php' => '4138cf307fea4ca68817b4c80250cab0',
- './include/utils/mvc_utils.php' => '621130cbb337fe28e83da67395ec67ca',
+ './include/utils/mvc_utils.php' => '9176cc44c66e70eb43af3134a4393fd2',
'./include/utils/encryption_utils.php' => '060b4fa727c1d48fa8ec2809e2fb58cf',
'./include/utils/db_utils.php' => '6c76995e0c7bfb05066e4e58a88e412a',
'./include/utils/autoloader.php' => '76818f941992acf4caa205cc6f2aa0c9',
'./include/utils/array_utils.php' => '4a63065e0ab62bfc33b9429f886ed7ec',
'./include/utils/activity_utils.php' => '96a8bd8977d5e7532e3b7d8ca3a583ee',
'./include/utils/LogicHook.php' => '3d65be3d74e10ecdf5aee20b2efceee6',
- './include/utils.php' => '7344356f7a1a616d960b5efc38f65422',
+ './include/utils.php' => '39ee0df9dd7a821e0b018a926e53f450',
'./include/upload_file.php' => '177f5eb2032e0c7797e11f93efb759f3',
'./include/timezone/timezones.php' => '0b0ffe9ce81f1652daec48cf2fbdd688',
'./include/templates/TemplateGroupChooser.php' => '111b7db20ad8143651bc7bba835894df',
@@ -3657,8 +3669,7 @@ $md5_string = array (
'./include/modules.php' => 'b016b295433b3b4d54c08eca90a566b4',
'./include/language/jsLanguage.php' => 'f39b23266c5f25d253082afb6a210fe2',
'./include/language/en_us.notify_template.html' => '4e90b0343ac29bf12687dddb15afea7d',
- './include/language/en_us.lang.php' => '0af7e9be3486c57d59a50a5df4bda645',
- './include/json_config.php' => '73219c3de81147aa2e18580b497353e6',
+ './include/language/en_us.lang.php' => '73f8214fa78457568c881183534d1911',
'./include/jsolait/init.js' => '15b8d113066ad400aa80d9dfc35b544b',
'./include/jsolait/missingmixin.js' => 'e87a7ee61bd9e134791325d98ca72d9b',
'./include/jsolait/lib/codecs.js' => 'c3e9eb73b3187f1b69e33bde1a635712',
@@ -3672,14 +3683,15 @@ $md5_string = array (
'./include/jsolait/lib/xmlrpc.js' => '561bc3aca65261c577ab56b9908d6b78',
'./include/jsolait/copying.txt' => '7fbc338309ac38fefcd64b04bb903e34',
'./include/jsolait/LICENSE' => '7fbc338309ac38fefcd64b04bb903e34',
- './include/javascript/sugar_grp_quickcomp.js' => '724cb0b1c64928dd5a20a5f280d23342',
- './include/javascript/sugar_grp_emails.js' => '5c70cfe438090cc94609b472ab007c88',
+ './include/json_config.php' => '73219c3de81147aa2e18580b497353e6',
+ './include/javascript/sugar_grp_quickcomp.js' => 'c7cea14477c8fc57e010fd2f76076826',
+ './include/javascript/sugar_grp_emails.js' => 'b55feea4d5ebe84a6f904a75950d3414',
'./include/javascript/sugar_grp_overlib.js' => '697dc29858751a3a9848ded2d5cc9638',
'./include/javascript/sugar_grp_yui2.js' => '810b0d52b0d73ca309673fa8c88f7275',
'./include/javascript/sugar_grp_yui_widgets.css' => '9fead3f803643c74f997b323e0a7b4e7',
'./include/javascript/sugar_grp_yui_widgets.js' => 'e4c888613deed6eeb327917a5f6f0c9c',
'./include/javascript/sugar_grp1_yui.js' => 'ca0556ee4f9844174000e6822ef46fc4',
- './include/javascript/sugar_grp1.js' => '3a1b8bb595ee443c5d934bb3a9ce1d8b',
+ './include/javascript/sugar_grp1.js' => '8136c11805a4e526a32413cd5d7eb52a',
'./include/javascript/cookie.js' => 'c17e3c176f5bb5b2683718f5b7d275a9',
'./include/javascript/dashlets.js' => '1e9808c9ce91257c101d96d4f947fdb3',
'./include/javascript/include.js' => '111549b33d8ca4011ca99a23105050fe',
@@ -3693,7 +3705,7 @@ $md5_string = array (
'./include/javascript/quickCompose.js' => '8702e1904189f22c31f88b05e22398e7',
'./include/javascript/quicksearch.js' => '0aa69ecc998c49edc302d388da955bac',
'./include/javascript/report_additionals.js' => 'e5f134ab662aefa681dc3c001b361730',
- './include/javascript/sugar_3.js' => 'fc89fba801b4dea0c529b3bf23b97986',
+ './include/javascript/sugar_3.js' => '49558dcafccb84e6ac9df6afe2fef82f',
'./include/javascript/sugar_connection_event_listener.js' => '6c40c4c05f7be79d30ce642029720cac',
'./include/javascript/swfobject.js' => 'be72d27dc0b8bf006dcb764e41153465',
'./include/javascript/calendar.js' => 'ee7be017a1f096bb94f425bdbe241dd4',
@@ -4736,9 +4748,9 @@ $md5_string = array (
'./include/generic/SugarWidgets/SugarWidgetField.php' => '606c1ac30b3a5f786c4d7c8d3e0e374f',
'./include/generic/SugarWidgets/SugarWidget.php' => '4edff0b5fec741dc5ec5212a9b3c1465',
'./include/generic/Save2.php' => '0314379008eb288d200406e362a5dd13',
- './include/generic/LayoutManager.php' => '83a873d5e712ff177bd2ba53b79c3ab4',
+ './include/generic/LayoutManager.php' => 'a87b35af9f4ce6e851797f94b6772425',
'./include/generic/DeleteRelationship.php' => '1c38fca0d35f81fb923b9271d4f96be3',
- './include/formbase.php' => 'b6de730ea87add960545ace7434d75a8',
+ './include/formbase.php' => 'ea5ba7e5d169135ec0dc3bad62fdb790',
'./include/fonts/License.html' => '8a22bc6b773aeb68f9748fd1920f84d4',
'./include/fonts/Times-Roman.afm' => 'f257a72c31f6a864f4e0994b1771628c',
'./include/fonts/Times-Italic.afm' => 'c41212e70e19627889aefef85212a47d',
@@ -4754,11 +4766,11 @@ $md5_string = array (
'./include/fonts/Courier-Bold.afm' => 'cb84ced0cc430a5d54497257a11638f5',
'./include/export_utils.php' => '306312d45892f75122cd5965876d0254',
'./include/entryPoint.php' => 'e25fe49080602ee59180d4ea18e4424f',
- './include/dir_inc.php' => '1f947162f6972a809b6506777c98df07',
+ './include/dir_inc.php' => '7fa525a179288303fb0cc34b89371b62',
'./include/database/SqlsrvManager.php' => '659363159024ac1885d50f8a8e3c31e3',
'./include/database/SqlsrvHelper.php' => '6cf5af120c1644866c0687ba1773d69e',
'./include/database/PearDatabase.php' => '029e54b3c4a2c9da75bdab75b906232e',
- './include/database/MysqliManager.php' => '32d9d06a3c621c7e0f9669f7622397af',
+ './include/database/MysqliManager.php' => '4b7748362a9ffbd38288cbd8619c0f89',
'./include/database/MysqliHelper.php' => '8824aa4be4b5946c8a6ad53d55d43adc',
'./include/database/MysqlManager.php' => '2fb21197c234df9ffca41ff9ab486a8a',
'./include/database/MysqlHelper.php' => 'da8cdfc7ed211c2efe150076a5c97f92',
@@ -4778,7 +4790,7 @@ $md5_string = array (
'./include/connectors/sources/loc/xml.php' => 'd75aa5e0e08d2ea04b283ed397235e40',
'./include/connectors/sources/ext/soap/soap.php' => 'f15da7e57e8dac314c819cccaed3933d',
'./include/connectors/sources/ext/rest/rest.php' => '223d5dbdcaa38397c1606a493b935ee1',
- './include/connectors/sources/default/source.php' => '42f30e93e6000bde2d1bbd8b4ef88a30',
+ './include/connectors/sources/default/source.php' => '158741672bd0289e33fd97fbd2fe5938',
'./include/connectors/sources/SourceFactory.php' => '8e2a76bda89e905821aee0568cb65fed',
'./include/connectors/formatters/ext/soap/tpls/default.tpl' => '30ac6e34be2b90079b7fa67e9916439b',
'./include/connectors/formatters/ext/rest/tpls/default.tpl' => 'a775bb54d09a292b0c3940f30758199a',
@@ -4793,7 +4805,7 @@ $md5_string = array (
'./include/VarDefHandler/listvardefoverride.php' => '9e156066bd3f24d00b62844589162ab1',
'./include/VarDefHandler/VarDefHandler.php' => 'ed481a168b11ed8306efdce0725e7b1f',
'./include/TimeDate.php' => '2bfe3be6536522e4e4a749efe3fda4ac',
- './include/TemplateHandler/TemplateHandler.php' => '7f3ed277a7c7fe420af3c079ff95e3c9',
+ './include/TemplateHandler/TemplateHandler.php' => '05efe77a92e9c7faf765ea99bf86f607',
'./include/Sugarpdf/sugarpdf_default.php' => '4e61fe9d5cd31ac41acc315423348ff7',
'./include/Sugarpdf/sugarpdf_config.php' => 'ecd77816c5def7f50b83d7c2336e7adf',
'./include/Sugarpdf/sugarpdf/sugarpdf.smarty.php' => 'dbe537b77ec1eb13e564269becaae15e',
@@ -4817,7 +4829,7 @@ $md5_string = array (
'./include/SugarCache/SugarCacheFile.php' => 'a367fcd4ef64e6f71a342b30cbb625ba',
'./include/SugarCache/SugarCacheAbstract.php' => '17c685bba109994950cdc66be58c4460',
'./include/SugarCache/SugarCacheAPC.php' => '0a237e55d4dc674145da1648576cbd28',
- './include/SugarCache/SugarCache.php' => 'a0ae65714d9c6babc1ae99f823706197',
+ './include/SugarCache/SugarCache.php' => '94c075853d48cea91295e3bc45327f69',
'./include/SugarObjects/templates/sale/vardefs.php' => 'c165fdc44aee37fdaa6918544b1f8fdc',
'./include/SugarObjects/templates/sale/metadata/subpanels/default.php' => 'e2ca78fec0686be0c1d1e6400a5c272a',
'./include/SugarObjects/templates/sale/metadata/searchdefs.php' => '02f9d5317fb7b44bfa9a1a965512e295',
@@ -4856,7 +4868,7 @@ $md5_string = array (
'./include/SugarObjects/templates/person/icons/person.gif' => 'ea5e2b2022166291d01ccedaf24b4e33',
'./include/SugarObjects/templates/person/icons/Createperson.gif' => '2e20692d501b15729294b80f4f311d77',
'./include/SugarObjects/templates/person/config.php' => 'ade871c96f0a91be8b4b27a06c280d33',
- './include/SugarObjects/templates/person/Person.php' => 'c98a468131e78a38a3240cf4dbfd766d',
+ './include/SugarObjects/templates/person/Person.php' => '526febbc58f7ba18ddee8130925ea508',
'./include/SugarObjects/templates/issue/vardefs.php' => '9bd9c6c69cd4833ce5bb3713e0eb7d0b',
'./include/SugarObjects/templates/issue/metadata/subpanels/default.php' => 'c4ad08eb6c1a932e1a26fc844def6b5e',
'./include/SugarObjects/templates/issue/metadata/searchdefs.php' => '8b387defff2b8da8873d8201281a7357',
@@ -4876,7 +4888,7 @@ $md5_string = array (
'./include/SugarObjects/templates/issue/config.php' => 'e03e19e958bd61c5964a0cf4f2f0304a',
'./include/SugarObjects/templates/issue/Issue.php' => '6f554147a4971954c1b42295b965949c',
'./include/SugarObjects/templates/file/views/view.edit.php' => '16d99d3314bdaafd0d14d3bf3be827b5',
- './include/SugarObjects/templates/file/vardefs.php' => '418b99637b42402343885a5b4fcd25af',
+ './include/SugarObjects/templates/file/vardefs.php' => 'e84fc8b69f07435478228715a06a5cba',
'./include/SugarObjects/templates/file/metadata/subpanels/default.php' => 'dd9fa46c03bcd7e6b11fd34e08d6e462',
'./include/SugarObjects/templates/file/metadata/searchdefs.php' => '7160ba30d43ad69e3ffbcae530ef3fba',
'./include/SugarObjects/templates/file/metadata/quickcreatedefs.php' => '3b8a2aedace4f3f94faa1752f4e4115f',
@@ -4933,7 +4945,7 @@ $md5_string = array (
'./include/SugarObjects/implements/team_security/language/en_us.lang.php' => '6d98aadfbb7a812f26d04d680670a308',
'./include/SugarObjects/implements/assignable/vardefs.php' => 'a548ffd7a3d6e6db97539837ac747137',
'./include/SugarObjects/implements/assignable/language/en_us.lang.php' => '364b577943f10dc538ebf1dbb46ca9a7',
- './include/SugarObjects/VardefManager.php' => 'bc234e9ab5e1ba0bc40dbaac97d6d846',
+ './include/SugarObjects/VardefManager.php' => '477ceccd79bb1010d3fcf21de33e7b0e',
'./include/SugarObjects/SugarSession.php' => '162a302292027328640b60bebc63cd2c',
'./include/SugarObjects/SugarRegistry.php' => '7fb93cfcaba8de431d61b07d3b52fc88',
'./include/SugarObjects/SugarConfig.php' => '5d1d1b107196e4bea8ac8ed54a829085',
@@ -5012,7 +5024,7 @@ $md5_string = array (
'./include/SugarFields/Fields/Int/EditView.tpl' => '53e2dbab0d2830fa6fc05433d7cf2027',
'./include/SugarFields/Fields/Int/DetailView.tpl' => '470958235306be68471cc439fab4888c',
'./include/SugarFields/Fields/Iframe/EditView.tpl' => 'bacaa9dc02c75000eaed3724023dbfd1',
- './include/SugarFields/Fields/Iframe/DetailView.tpl' => '69c4a2ee326250a55a11979eac008eff',
+ './include/SugarFields/Fields/Iframe/DetailView.tpl' => 'a17f569da4dcfe2fb401ae6e295b23aa',
'./include/SugarFields/Fields/Html/SugarFieldHtml.php' => 'cdb62d1c4ca61e8eebbba05d95372ded',
'./include/SugarFields/Fields/Html/DetailView.tpl' => 'fc4ff8f6b0ec4a434a249c542cd97faa',
'./include/SugarFields/Fields/Fullname/SugarFieldFullname.php' => '223fee90ff8e764b5de216b44c4c110d',
@@ -5020,10 +5032,10 @@ $md5_string = array (
'./include/SugarFields/Fields/Float/SugarFieldFloat.php' => '2e986db8221d8381094a0cfc55b37c3f',
'./include/SugarFields/Fields/Float/EditView.tpl' => '2d68a06fdf2c1e032fc144905af33437',
'./include/SugarFields/Fields/Float/DetailView.tpl' => '82f280a7d4e3f74d2ab0cd481021fe3d',
- './include/SugarFields/Fields/File/SugarFieldFile.js' => '8ea8563718821e31d6cca721903afbf5',
+ './include/SugarFields/Fields/File/SugarFieldFile.js' => 'b35d39bce43f628045258360754a7911',
'./include/SugarFields/Fields/File/SearchView.tpl' => '3caa8a3b0a97a20169c404260788879f',
'./include/SugarFields/Fields/File/ListView.tpl' => 'd747a01d5b25abb348c51f7bd0154403',
- './include/SugarFields/Fields/File/SugarFieldFile.php' => 'b3e212cecd945057b984c89567076dfb',
+ './include/SugarFields/Fields/File/SugarFieldFile.php' => 'f6bc4adb18ef8b53f4361f366dc7fb33',
'./include/SugarFields/Fields/File/EditView.tpl' => '76ef95550d9f50581f43fdaa2af3cc77',
'./include/SugarFields/Fields/File/DetailView.tpl' => 'b2b300b0591fd73e4ea65f597ea0235c',
'./include/SugarFields/Fields/Enum/SugarFieldEnum.php' => '01b94cd983a49a9e5e3a293a6cdec390',
@@ -5045,9 +5057,9 @@ $md5_string = array (
'./include/SugarFields/Fields/Currency/ListView.tpl' => 'c62e2997785bf58a314576d5a69fb6f9',
'./include/SugarFields/Fields/Currency/EditView.tpl' => 'df0a9a55388c72e731733fa6744569f9',
'./include/SugarFields/Fields/Currency/DetailView.tpl' => '07b10accc2d817376b207b935182c60b',
- './include/SugarFields/Fields/Collection/SugarFieldCollection.js' => 'df352c5e6c25179225efdadab2bd42a8',
+ './include/SugarFields/Fields/Collection/SugarFieldCollection.js' => '2af30a1d9152c09b47c7549f817d98be',
'./include/SugarFields/Fields/Collection/view.sugarfieldcollection.php' => '626c0b184463b413735031b6c051db97',
- './include/SugarFields/Fields/Collection/ViewSugarFieldCollection.php' => '74bceaa60d33dfeeddee76fcdfba032e',
+ './include/SugarFields/Fields/Collection/ViewSugarFieldCollection.php' => 'e8aba5a28ed899deff195b0f1d7b413f',
'./include/SugarFields/Fields/Collection/SugarFieldCollection.php' => 'bd1b5641e51667726ff658a4c7833732',
'./include/SugarFields/Fields/Collection/EditView.tpl' => '45349bf1c932fce030a1324a087ab949',
'./include/SugarFields/Fields/Collection/DetailView.tpl' => '61608ee9c8fb18e5d0d7d4b4c4eb1208',
@@ -5099,11 +5111,11 @@ $md5_string = array (
'./include/SugarCharts/swf/stackedGroupByChart.swf' => '0d524ea04b2c56d1c7cdc86194f59ed1',
'./include/SugarCharts/SugarChartFactory.php' => 'ff55d866d2c0fde548e7666aff189ebc',
'./include/SugarCharts/JsChart.php' => '05f53698530fa26980b46fcf38ea39e0',
- './include/SugarCharts/Jit/tpls/chart.tpl' => 'f0b11091af0c81133f6b67d90b04bbfd',
+ './include/SugarCharts/Jit/tpls/chart.tpl' => 'e224555cacd075ed49e115b7b6d0049e',
'./include/SugarCharts/Jit/tpls/DashletGenericChartScript.tpl' => '5197cef3a47d67ee627e15446d287a46',
- './include/SugarCharts/Jit/js/mySugarCharts.js' => 'a4efbd85b72d7f023ac35a7eb5655151',
- './include/SugarCharts/Jit/js/sugarCharts.js' => '5b17d377e7fd08f5f08bd1345fa0b038',
- './include/SugarCharts/Jit/js/Jit/jit.js' => '393dab7a34ed4c98dbfdacdbbb62d37e',
+ './include/SugarCharts/Jit/js/mySugarCharts.js' => '180f2b7c4859432a426a2be5629fd985',
+ './include/SugarCharts/Jit/js/sugarCharts.js' => '121053f6b356fb4c63e13f0e3c971416',
+ './include/SugarCharts/Jit/js/Jit/jit.js' => 'd326f248c3c5023fa760af94674a4d6f',
'./include/SugarCharts/Jit/css/base.css' => '775352bc541e0480ba0c5c03f0c4c56a',
'./include/SugarCharts/Jit/JitReports.php' => '4578c83c6260d80a1f9e641b48501625',
'./include/SugarCharts/Jit/Jit.php' => '38d283b800042e0764f930ce43e8879d',
@@ -5235,12 +5247,12 @@ $md5_string = array (
'./include/SearchForm/SugarSpot.php' => '0536606cc025c51415010ff7ea4c307b',
'./include/SearchForm/SearchForm2.php' => '1ffbb26f8443233eb18e509b521333e3',
'./include/SearchForm/SearchForm.php' => 'b05b4a135d0d1074a0529e4e248541c3',
- './include/QuickSearchDefaults.php' => '136a9b7d9a33ee8818b45b570f656984',
+ './include/QuickSearchDefaults.php' => 'e3fa93b16371d241f92647ac0ffec396',
'./include/Popups/tpls/header.tpl' => '165bcfc57f5f9defc594f76debf796af',
'./include/Popups/tpls/footer.tpl' => '772a43d16594a76e89c5a7249e5d23b6',
'./include/Popups/tpls/PopupGeneric.tpl' => '99507106e55ee28bcd652882b188b236',
'./include/Popups/Popup_picker.php' => '2b2071f0293ba8a28f95dd657598910d',
- './include/Popups/PopupSmarty.php' => '3bf1178f261c6f8ef95c7f1c7fa06ed7',
+ './include/Popups/PopupSmarty.php' => 'dae7bea856d81605c7dd0b73c8d2e6ed',
'./include/Pear/XML_HTMLSax3/LICENSE' => 'a45bb1bbeed9e26b26c5763df1d3913d',
'./include/Pear/XML_HTMLSax3/HTMLSax3/States.php' => '5b528baa84631f85349a7183597d2fb3',
'./include/Pear/XML_HTMLSax3/HTMLSax3/Decorators.php' => '34a9a95566c891f013584073fbadaf7e',
@@ -5260,7 +5272,7 @@ $md5_string = array (
'./include/MySugar/javascript/MySugar.js' => 'f2469a918adaf694736ef8087c9864a5',
'./include/MySugar/MySugar.php' => '49a8305a2193bbe445ac092d22ff854d',
'./include/MySugar/DashletsDialog/DashletsDialog.php' => 'e16fcfab4cb76f1cbfb4d8d4fb53100a',
- './include/MassUpdate.php' => '2825b390dc880789beffd3fb3cb8f067',
+ './include/MassUpdate.php' => 'c3f2e6188f5b6afff2958a08ac95afcb',
'./include/MVC/View/views/view.xml.php' => '028d18c71c2dae2db826d0cc6d32306c',
'./include/MVC/View/views/view.vcard.php' => '32fa32960fe82caee39fcb8833541ad5',
'./include/MVC/View/views/view.sugarpdf.php' => '334694668f28d954182d05c196eef396',
@@ -5268,7 +5280,7 @@ $md5_string = array (
'./include/MVC/View/views/view.serialized.php' => '6746e128e8dacee78ecbf70ea3559cbb',
'./include/MVC/View/views/view.quickcreate.php' => 'b5d1b6e53d0aee0462eef68463a8a333',
'./include/MVC/View/views/view.quick.php' => '9a1fa9ad8fce5230124ee320fcc42266',
- './include/MVC/View/views/view.popup.php' => '6e671cdfa4f08713a164db002cfd5db9',
+ './include/MVC/View/views/view.popup.php' => '7b8043992e9113658223bcb0c501465a',
'./include/MVC/View/views/view.noaccess.php' => '1cab33d38afb080ca5dbfaa70a05e69a',
'./include/MVC/View/views/view.multiedit.php' => 'b727fe11b404c9cbfb80b23cbbd13a4c',
'./include/MVC/View/views/view.modulelistmenu.php' => 'd1f9e8f7977602eab7faf6cb9ece2144',
@@ -5287,11 +5299,11 @@ $md5_string = array (
'./include/MVC/View/tpls/modulelistmenu.tpl' => '796ce676d310cf69a84618aa0c85082e',
'./include/MVC/View/tpls/Importvcard.tpl' => 'aa5117be30dc5b8c1fc726ba44a3eb00',
'./include/MVC/View/ViewFactory.php' => '822d3723675b0edcaf1f7b5cb65fb3c2',
- './include/MVC/View/SugarView.php' => '48b191c2a868a070223f66a50443866f',
+ './include/MVC/View/SugarView.php' => '44c4ee4ba90c61f6fa74b2c0423efb0f',
'./include/MVC/SugarModule.php' => 'ce58476e24ad1717fe30192d10e28adc',
- './include/MVC/SugarApplication.php' => '1b5adb291ecedffd526d6b1aa9811e96',
+ './include/MVC/SugarApplication.php' => 'c0ee7ebcacd32a865b10e3d4144519af',
'./include/MVC/Controller/file_access_control_map.php' => 'c94a1a349da51c17f5758d5f1ad6a364',
- './include/MVC/Controller/entry_point_registry.php' => '38fefdc2607b5fd0c43647b670a2101e',
+ './include/MVC/Controller/entry_point_registry.php' => '0b6daeee64e3648e297811bbcd297717',
'./include/MVC/Controller/action_view_map.php' => 'b5a22402b8cd64eb8971a99a14a99c03',
'./include/MVC/Controller/action_file_map.php' => 'c35918d4fb518bb6f3c682efbabc10a4',
'./include/MVC/Controller/SugarController.php' => 'b5282938e4490ca8d23b6193094f8194',
@@ -5299,9 +5311,9 @@ $md5_string = array (
'./include/Localization/Localization.php' => 'de0035fc0f86167c97302fd381e0fcca',
'./include/ListView/ListViewDCMenu.tpl' => '996e1ff91b59dc978c3f59bf36b55599',
'./include/ListView/ListViewXTPL.php' => 'e70a4929a6e81eb2f63d60a5302c0780',
- './include/ListView/ListViewSmarty.php' => 'e5ec337f92513cd58eb8479d6c8aa2d6',
+ './include/ListView/ListViewSmarty.php' => 'dc37b331de2c2423b6b001f3f3c6eec5',
'./include/ListView/ListViewPagination.tpl' => 'bcb4adbaea266d27495ac72fa7a4721d',
- './include/ListView/ListViewNoMassUpdate.tpl' => 'd999dcd6c68e5263bcebc90be6092c1f',
+ './include/ListView/ListViewNoMassUpdate.tpl' => 'a5f2bfb2b49fd004a9dd1263bb74c5b7',
'./include/ListView/ListViewGeneric.tpl' => 'a9d91145abddf09489f6b39b10469714',
'./include/ListView/ListViewFacade.php' => 'eca289f7cf40a7e503255644bec57716',
'./include/ListView/ListViewDisplay.php' => 'f043bb8443a23bc1bf14114ba1ee3200',
@@ -5332,12 +5344,12 @@ $md5_string = array (
'./include/DetailView/DetailView.tpl' => '1058c91ce17689ca96031d2167be971e',
'./include/DetailView/DetailView.php' => '35d047b596e7d3c9e122703c9c0c9c2b',
'./include/Dashlets/DashletGenericAutoRefreshDynamic.tpl' => 'f769c32f17ac26313b340fec2861112e',
- './include/Dashlets/DashletGenericDisplay.tpl' => 'bbe1d3bd20d84ee31037aa3f02623a0a',
+ './include/Dashlets/DashletGenericDisplay.tpl' => '810e79d4d561f4f54d0c533777baa9d6',
'./include/Dashlets/DashletGenericConfigure.tpl' => '9c9bdb6f6d6a79b2ac325fc40790b695',
'./include/Dashlets/DashletGenericAutoRefresh.tpl' => '6142a7f53bcf1b5b45414ef2aa415639',
'./include/Dashlets/DashletGenericChartConfigure.tpl' => 'db96a4bcb690f325cfb41e60ab4b4791',
'./include/Dashlets/DashletGenericChart.php' => '4ba364f711dc6a9e295298c9e685b00f',
- './include/Dashlets/DashletGeneric.php' => 'cfe4bba351ebc874a1380430608acfe2',
+ './include/Dashlets/DashletGeneric.php' => '6a914b9515d29587019f1d5f20823a45',
'./include/Dashlets/DashletCacheBuilder.php' => '80f7f6f582d141f5b1e3f8d5da52bf34',
'./include/Dashlets/Dashlet.php' => 'c6096d2756a85211bdd40d8013047e78',
'./image.php' => '59c0f0d2767ed6ed5eac96335ad6d732',
@@ -5745,7 +5757,7 @@ $md5_string = array (
'./export.php' => '44550cd8bb3c34fc7b8dac67b549b6db',
'./data/upload/index.html' => '9cd784063d39b18d308932c28c385853',
'./data/Tracker.php' => '5dfc3f390ecccd8cbb1229e01f878593',
- './data/SugarBean.php' => 'a4f1863929b6ac87f8090ebecb1ce40d',
+ './data/SugarBean.php' => 'b49ca9de8ca26a94bba549c835ee80a2',
'./data/Link.php' => '0eb776610e6f09640760c67412d69184',
'./custom/index.html' => 'b0070a296647b6026d1800db14510e3c',
'./cron.php' => '99055ca0a11c9810e9d3d655c4fb32d2',
47 include/Dashlets/DashletGeneric.php
View
@@ -203,7 +203,11 @@ function processDisplayOptions() {
$currentSearchFields[$name] = array();
$widgetDef = $this->seedBean->field_defs[$name];
if($widgetDef['type'] == 'enum') $widgetDef['remove_blank'] = true; // remove the blank option for the dropdown
- if($widgetDef['name'] == 'assigned_user_name') $widgetDef['name'] = 'assigned_user_id';
+ if($widgetDef['name'] == 'assigned_user_name') $widgetDef['name'] = 'assigned_user_id';
+ //bug 39170 - begin
+ if($widgetDef['name'] == 'created_by_name') $name = $widgetDef['name'] = 'created_by';
+ if($widgetDef['name'] == 'modified_by_name') $name = $widgetDef['name'] = 'modified_user_id';
+ //bug 39170 - end
$widgetDef['input_name0'] = empty($this->filters[$name]) ? '' : $this->filters[$name];
$currentSearchFields[$name]['label'] = !empty($params['label']) ? translate($params['label'], $this->seedBean->module_dir) : translate($widgetDef['vname'], $this->seedBean->module_dir);
$currentSearchFields[$name]['input'] = $this->layoutManager->widgetDisplayInput($widgetDef, true, (empty($this->filters[$name]) ? '' : $this->filters[$name]));
@@ -235,7 +239,7 @@ function processDisplayOptions() {
$displayRowOptions = $GLOBALS['sugar_config']['dashlet_display_row_options'];
$this->configureSS->assign('displayRowOptions', $displayRowOptions);
$this->configureSS->assign('displayRowSelect', $this->displayRows);
-
+
if($this->isAutoRefreshable()) {
$this->configureSS->assign('isRefreshable', true);
$this->configureSS->assign('autoRefreshOptions', $this->getAutoRefreshOptions());
@@ -329,11 +333,11 @@ protected function loadCustomMetadata()
break;
}
}
-
+
$this->columns = $dashletData[$this->seedBean->module_dir.'Dashlet']['columns'];
}
}
-
+
/**
* Does all dashlet processing, here's your chance to modify the rows being displayed!
*/
@@ -350,7 +354,7 @@ function process($lvsParams = array()) {
if(isset($this->filters) || $this->myItemsOnly) {
$whereArray = $this->buildWhere();
}
-
+
$this->lvs->export = false;
$this->lvs->multiSelect = false;
// columns
@@ -359,9 +363,9 @@ function process($lvsParams = array()) {
foreach($this->displayColumns as $name => $val) {
$displayColumns[strtoupper($val)] = $this->columns[$val];
$displayColumns[strtoupper($val)]['label'] = trim($displayColumns[strtoupper($val)]['label'], ':');// strip : at the end of headers
- }
+ }
}
- else if (isset($this->columns)){
+ else if (isset($this->columns)){
// use the default
foreach($this->columns as $name => $val) {
if(!empty($val['default']) && $val['default']) {
@@ -377,18 +381,27 @@ function process($lvsParams = array()) {
$lvdOrderBy = $this->lvs->lvd->getOrderBy(); // has this list been ordered, if not use default
$nameRelatedFields = array();
- if(empty($lvdOrderBy['orderBy'])) {
- foreach($displayColumns as $colName => $colParams) {
- if(!empty($colParams['defaultOrderColumn'])) {
- $lvsParams['overrideOrder'] = true;
- $lvsParams['orderBy'] = $colName;
- $lvsParams['sortOrder'] = $colParams['defaultOrderColumn']['sortOrder'];
+
+ //bug: 44592 - dashlet sort order was not being preserved between logins
+ if(!empty($lvsParams['orderBy']) && !empty($lvsParams['sortOrder']))
+ {
+ $lvsParams['overrideOrder'] = true;
+ }
+ else
+ {
+ if(empty($lvdOrderBy['orderBy'])) {
+ foreach($displayColumns as $colName => $colParams) {
+ if(!empty($colParams['defaultOrderColumn'])) {
+ $lvsParams['overrideOrder'] = true;
+ $lvsParams['orderBy'] = $colName;
+ $lvsParams['sortOrder'] = $colParams['defaultOrderColumn']['sortOrder'];
+ }
}
}
}
// Check for 'last_name' column sorting with related fields (last_name, first_name)
// See ListViewData.php for actual sorting change.
- if ($lvdOrderBy['orderBy'] == 'last_name' && !empty($displayColumns['NAME']) && !empty($displayColumns['NAME']['related_fields']) &&
+ if ($lvdOrderBy['orderBy'] == 'last_name' && !empty($displayColumns['NAME']) && !empty($displayColumns['NAME']['related_fields']) &&
in_array('last_name', $displayColumns['NAME']['related_fields']) &&
in_array('first_name', $displayColumns['NAME']['related_fields'])) {
$lvsParams['overrideLastNameOrder'] = true;
@@ -445,6 +458,10 @@ function saveOptions($req) {
$options['filters'] = array();
foreach($this->searchFields as $name=>$params) {
$widgetDef = $this->seedBean->field_defs[$name];
+ //bug39170 - begin
+ if($widgetDef['name']=='created_by_name' && $req['created_by']) $widgetDef['name'] = 'created_by';
+ if($widgetDef['name']=='modified_by_name' && $req['modified_user_id']) $widgetDef['name'] = 'modified_user_id';
+ //bug39170 - end
if($widgetDef['type'] == 'datetimecombo' || $widgetDef['type'] == 'datetime' || $widgetDef['type'] == 'date') { // special case datetime types
$options['filters'][$widgetDef['name']] = array();
if(!empty($req['type_' . $widgetDef['name']])) { // save the type of date filter
@@ -497,7 +514,7 @@ function addCustomFields() {
$this->columns[$fieldName] = array('width' => '10',
'label' => $translated);
}
-
+
}
}
}
34 include/Dashlets/DashletGenericDisplay.tpl
View
@@ -47,26 +47,26 @@
<table border='0' cellpadding='0' cellspacing='0' width='100%'>
<tr>
<td align='left'>&nbsp;</td>
- <td align='right' nowrap='nowrap'>
+ <td align='right' nowrap='nowrap'>
{if $pageData.urls.startPage}
<!--<a href='#' onclick='return SUGAR.mySugar.retrieveDashlet("{$dashletId}", "{$pageData.urls.startPage}")' ><img src='{sugar_getimagepath file="start.png"}' alt='{$navStrings.start}' align='absmiddle' border='0' width='14' height='13'>&nbsp;{$navStrings.start}</a>&nbsp;-->
<button title='{$navStrings.start}' class='button' onclick='return SUGAR.mySugar.retrieveDashlet("{$dashletId}", "{$pageData.urls.startPage}")'>
<img src='{sugar_getimagepath file='start.png'}' alt='{$navStrings.start}' align='absmiddle' border='0'>
</button>
-
+
{else}
<!--<img src='{sugar_getimagepath file="start_off.png"}' alt='{$navStrings.start}' align='absmiddle' border='0'>&nbsp;{$navStrings.start}&nbsp;&nbsp;-->
<button title='{$navStrings.start}' class='button' disabled>
<img src='{sugar_getimagepath file='start_off.png'}' alt='{$navStrings.start}' align='absmiddle' border='0'>
</button>
-
+
{/if}
{if $pageData.urls.prevPage}
<!--<a href='#' onclick='return SUGAR.mySugar.retrieveDashlet("{$dashletId}", "{$pageData.urls.prevPage}")' ><img src='{sugar_getimagepath file="previous.png"}' alt='{$navStrings.previous}' align='absmiddle' border='0' width='8' height='13'>&nbsp;{$navStrings.previous}</a>&nbsp;-->
<button title='{$navStrings.previous}' class='button' onclick='return SUGAR.mySugar.retrieveDashlet("{$dashletId}", "{$pageData.urls.prevPage}")'>
- <img src='{sugar_getimagepath file='previous.png'}' alt='{$navStrings.previous}' align='absmiddle' border='0'>
+ <img src='{sugar_getimagepath file='previous.png'}' alt='{$navStrings.previous}' align='absmiddle' border='0'>
</button>
-
+
{else}
<!--<img src='{sugar_getimagepath file="previous_off.png"}' alt='{$navStrings.previous}' align='absmiddle' border='0' width='8' height='13'>&nbsp;{$navStrings.previous}&nbsp;-->
<button class='button' disabled title='{$navStrings.previous}'>
@@ -79,7 +79,7 @@
<button title='{$navStrings.next}' class='button' onclick='return SUGAR.mySugar.retrieveDashlet("{$dashletId}", "{$pageData.urls.nextPage}")'>
<img src='{sugar_getimagepath file='next.png'}' alt='{$navStrings.next}' align='absmiddle' border='0'>
</button>
-
+
{else}
<!-- &nbsp;{$navStrings.next}&nbsp;<img src='{sugar_getimagepath file="next_off.png"}' alt='{$navStrings.next}' align='absmiddle' border='0' width='8' height='13'>-->
<button class='button' title='{$navStrings.next}' disabled>
@@ -90,15 +90,15 @@
{if $pageData.urls.endPage && $pageData.offsets.total != $pageData.offsets.lastOffsetOnPage}
<!--<a href='#' onclick='return SUGAR.mySugar.retrieveDashlet("{$dashletId}", "{$pageData.urls.endPage}")' >{$navStrings.end}&nbsp;<img src='{sugar_getimagepath file="end.png"}' alt='{$navStrings.end}' align='absmiddle' border='0' width='14' height='13'></a></td>-->
<button title='{$navStrings.end}' class='button' onclick='return SUGAR.mySugar.retrieveDashlet("{$dashletId}", "{$pageData.urls.endPage}")'>
- <img src='{sugar_getimagepath file='end.png'}' alt='{$navStrings.end}' align='absmiddle' border='0'>
+ <img src='{sugar_getimagepath file='end.png'}' alt='{$navStrings.end}' align='absmiddle' border='0'>
</button>
-
+
{elseif !$pageData.offsets.totalCounted || $pageData.offsets.total == $pageData.offsets.lastOffsetOnPage}
<!--&nbsp;{$navStrings.end}&nbsp;<img src='{sugar_getimagepath file="end_off.png"}' alt='{$navStrings.end}' align='absmiddle' border='0' width='14' height='13'>-->
<button class='button' disabled title='{$navStrings.end}'>
<img src='{sugar_getimagepath file='end_off.png'}' alt='{$navStrings.end}' align='absmiddle' border='0'>
</button>
-
+
{/if}
</td>
</tr>
@@ -109,7 +109,7 @@
{foreach from=$displayColumns key=colHeader item=params}
<th scope='col' width='{$params.width}%' nowrap="nowrap">
<div style='white-space: nowrap;'width='100%' align='{$params.align|default:'left'}'>
- {if $params.sortable|default:true}
+ {if $params.sortable|default:true}
<a href='#' onclick='return SUGAR.mySugar.retrieveDashlet("{$dashletId}", "{$pageData.urls.orderBy}{$params.orderBy|default:$colHeader|lower}&sugar_body_only=1&id={$dashletId}")' class='listViewThLinkS1'>{sugar_translate label=$params.label module=$pageData.bean.moduleDir}</a>&nbsp;&nbsp;
{if $params.orderBy|default:$colHeader|lower == $pageData.ordering.orderBy}
{if $pageData.ordering.sortOrder == 'ASC'}
@@ -124,7 +124,7 @@
<img border='0' src='{sugar_getimagepath file=$imageName}' width='{$arrowWidth}' height='{$arrowHeight}' align='absmiddle' alt='{$arrowAlt}'>
{/if}
{else}
- {if !isset($params.noHeader) || $params.noHeader == false}
+ {if !isset($params.noHeader) || $params.noHeader == false}
{sugar_translate label=$params.label module=$pageData.bean.moduleDir}
{/if}
{/if}
@@ -135,7 +135,7 @@
<th scope='col' nowrap="nowrap" width='1%'>&nbsp;</th>
{/if}
</tr>
-
+
{foreach name=rowIteration from=$data key=id item=rowData}
{if $smarty.foreach.rowIteration.iteration is odd}
{assign var='_rowColor' value=$rowColor[0]}
@@ -153,12 +153,12 @@
{strip}
<td scope='row' align='{$params.align|default:'left'}' valign="top" {if ($params.type == 'teamset')}class="nowrap"{/if}>
{if $col == 'NAME' || $params.bold}<b>{/if}
- {if $params.link && !$params.customCode}
+ {if $params.link && !$params.customCode}
<{$pageData.tag.$id[$params.ACLTag]|default:$pageData.tag.$id.MAIN} href='index.php?action={$params.action|default:'DetailView'}&module={if $params.dynamic_module}{$rowData[$params.dynamic_module]}{else}{$params.module|default:$pageData.bean.moduleDir}{/if}&record={$rowData[$params.id]|default:$rowData.ID}&offset={$pageData.offsets.current+$smarty.foreach.rowIteration.iteration}&stamp={$pageData.stamp}'>
{/if}
- {if $params.customCode}
+ {if $params.customCode}
{sugar_evalcolumn_old var=$params.customCode rowData=$rowData}
- {else}
+ {else}
{sugar_field parentFieldArray=$rowData vardef=$params displayType=ListView field=$col}
{/if}
{if empty($rowData.$col) && empty($params.customCode)}&nbsp;{/if}
@@ -173,10 +173,10 @@
{if !empty($quickViewLinks)}
<td width='1%' class='{$_rowColor}S1' bgcolor='{$_bgColor}' nowrap>
{if $pageData.access.edit}
- <a title='{$editLinkString}' href='index.php?action=EditView&module={$params.module|default:$pageData.bean.moduleDir}&record={$rowData[$params.parent_id]|default:$rowData.ID}&offset={$pageData.offsets.current+$smarty.foreach.rowIteration.iteration}&stamp={$pageData.stamp}&return_module=Home&return_action=index'><img border="0" src="{sugar_getimagepath file="edit_inline.png"}"></a>
+ <a title='{$editLinkString}' href='index.php?action=EditView&module={$pageData.bean.moduleDir}&record={$rowData.ID}&offset={$pageData.offsets.current+$smarty.foreach.rowIteration.iteration}&stamp={$pageData.stamp}&return_module=Home&return_action=index'><img border="0" src="{sugar_getimagepath file="edit_inline.png"}"></a>
{/if}
{if $pageData.access.view}
- <a title='{$viewLinkString}' href='index.php?action=DetailView&module={$params.module|default:$pageData.bean.moduleDir}&record={$rowData[$params.parent_id]|default:$rowData.ID}&offset={$pageData.offsets.current+$smarty.foreach.rowIteration.iteration}&stamp={$pageData.stamp}&return_module=Home&return_action=index'><img border="0" src="{sugar_getimagepath file="view_inline.png"}"></a>
+ <a title='{$viewLinkString}' href='index.php?action=DetailView&module={$pageData.bean.moduleDir}&record={$rowData.ID}&offset={$pageData.offsets.current+$smarty.foreach.rowIteration.iteration}&stamp={$pageData.stamp}&return_module=Home&return_action=index'><img border="0" src="{sugar_getimagepath file="view_inline.png"}"></a>
{/if}
</td>
{/if}
12 include/ListView/ListViewNoMassUpdate.tpl
View
@@ -79,7 +79,7 @@
{counter name="colCounter"}
{/foreach}
</tr>
-
+
{foreach name=rowIteration from=$data key=id item=rowData}
{if $smarty.foreach.rowIteration.iteration is odd}
{assign var='_rowColor' value=$rowColor[0]}
@@ -90,7 +90,7 @@
{if !empty($quickViewLinks)}
<td width='1%' nowrap>
{if $pageData.access.edit && $pageData.bean.moduleDir != "Employees"}
- <a title='{$editLinkString}' href='index.php?action=EditView&module={$params.module|default:$pageData.bean.moduleDir}&record={$rowData[$params.id]|default:$rowData.ID}&offset={$pageData.offsets.current+$smarty.foreach.rowIteration.iteration}&stamp={$pageData.stamp}&return_module={$params.module|default:$pageData.bean.moduleDir}'><img border="0" src="{sugar_getimagepath file="edit_inline.gif"}"></a>
+ <a title='{$editLinkString}' href='index.php?action=EditView&module={$pageData.bean.moduleDir}&record={$rowData.ID}&offset={$pageData.offsets.current+$smarty.foreach.rowIteration.iteration}&stamp={$pageData.stamp}&return_module={$pageData.bean.moduleDir}'><img border="0" src="{sugar_getimagepath file="edit_inline.gif"}"></a>
{/if}
</td>
{/if}
@@ -101,9 +101,9 @@
{if $params.link && !$params.customCode}
<{$pageData.tag.$id[$params.ACLTag]|default:$pageData.tag.$id.MAIN} href="#" onMouseOver="javascript:lvg_nav('{if $params.dynamic_module}{$rowData[$params.dynamic_module]}{else}{$params.module|default:$pageData.bean.moduleDir}{/if}', '{$rowData[$params.id]|default:$rowData.ID}', 'd', {$smarty.foreach.rowIteration.iteration}, this);" onFocus="javascript:lvg_nav('{if $params.dynamic_module}{$rowData[$params.dynamic_module]}{else}{$params.module|default:$pageData.bean.moduleDir}{/if}', '{$rowData[$params.id]|default:$rowData.ID}', 'd', {$smarty.foreach.rowIteration.iteration}, this);">
{/if}
- {if $params.customCode}
+ {if $params.customCode}
{sugar_evalcolumn_old var=$params.customCode rowData=$rowData}
- {else}
+ {else}
{sugar_field parentFieldArray=$rowData vardef=$params displayType=ListView field=$col}
{/if}
{if empty($rowData.$col)}&nbsp;{/if}
@@ -120,13 +120,13 @@
<td colspan="{$colCount}">
<em>{$APP.LBL_NO_DATA}</em>
</td>
- </tr>
+ </tr>
{/foreach}
{include file='include/ListView/ListViewPagination.tpl'}
</table>
<script type='text/javascript'>
{literal}function lvg_nav(m,id,act,offset,t){if(t.href.search(/#/) < 0){return;}else{if(act=='pte'){act='ProjectTemplatesEditView';}else if(act=='d'){ act='DetailView';}else if( act =='ReportsWizard'){act = 'ReportsWizard';}else{ act='EditView';}{/literal}url = 'index.php?module='+m+'&offset=' + offset + '&stamp={$pageData.stamp}&return_module='+m+'&action='+act+'&record='+id;t.href=url;{literal}}}{/literal}
-{literal}function lvg_dtails(id){{/literal}return SUGAR.util.getAdditionalDetails( '{$params.module|default:$pageData.bean.moduleDir}',id, 'adspan_'+id);{literal}}{/literal}
+{literal}function lvg_dtails(id){{/literal}return SUGAR.util.getAdditionalDetails( '{$pageData.bean.moduleDir}',id, 'adspan_'+id);{literal}}{/literal}
{if $contextMenus}
{$contextMenuScript}
{/if}
4 include/ListView/ListViewSmarty.php
View
@@ -153,8 +153,8 @@ function process($file, $data, $htmlVar) {
$this->ss->assign('rowColor', array('oddListRow', 'evenListRow'));
$this->ss->assign('bgColor', array($odd_bg, $even_bg));
$this->ss->assign('contextMenus', $this->contextMenus);
- $this->ss->assign('is_admin_for_user', is_admin_for_module($GLOBALS['current_user'],'Users'));
- $this->ss->assign('is_admin', is_admin($GLOBALS['current_user']));
+ $this->ss->assign('is_admin_for_user', $GLOBALS['current_user']->isAdminForModule('Users'));
+ $this->ss->assign('is_admin', $GLOBALS['current_user']->isAdmin());
if($this->contextMenus && !empty($contextMenuObjectsTypes)) {
1  include/MVC/Controller/entry_point_registry.php
View
@@ -43,6 +43,7 @@
* Contributor(s): ______________________________________..
********************************************************************************/
$entry_point_registry = array(
+ 'emailImage' => array('file' => 'modules/EmailMan/EmailImage.php', 'auth' => false),
'download' => array('file' => 'download.php', 'auth' => true),
'export' => array('file' => 'export.php', 'auth' => true),
'export_dataset' => array('file' => 'export_dataset.php', 'auth' => true),
2  include/MVC/SugarApplication.php
View
@@ -281,7 +281,7 @@ function handleOfflineClient(){
* Handles everything related to authorization.
*/
function handleAccessControl(){
- if(is_admin($GLOBALS['current_user']) || is_admin_for_any_module($GLOBALS['current_user']))
+ if($GLOBALS['current_user']->isDeveloperForAnyModule())
return;
if(!empty($_REQUEST['action']) && $_REQUEST['action']=="RetrieveEmail")
return;
3  include/MVC/View/SugarView.php
View
@@ -125,6 +125,9 @@ public function process()
$this->preDisplay();
$this->displayErrors();
$this->display();
+ if ( !empty($this->module) ) {
+ $GLOBALS['logic_hook']->call_custom_logic($this->module, 'after_ui_frame');
+ }
$GLOBALS['logic_hook']->call_custom_logic('', 'after_ui_frame');
if ($this->_getOption('show_subpanels')) $this->_displaySubPanels();
if ($this->action === 'Login') {
2  include/MVC/View/views/view.popup.php
View
@@ -46,7 +46,7 @@ function display(){
if(($this->bean instanceOf SugarBean) && !$this->bean->ACLAccess('list')){
ACLController::displayNoAccess();
sugar_cleanup(true);
- }
+ }
if(isset($_REQUEST['metadata']) && strpos($_REQUEST['metadata'], "..") !== false)
die("Directory navigation attack denied.");
2  include/MassUpdate.php
View
@@ -1217,7 +1217,7 @@ function generateSearchWhere($module, $query) {//this function is similar with f
}
/* bug 31271: using false to not add all bean fields since some beans - like SavedReports
can have fields named 'module' etc. which may break the query */
- $searchForm->populateFromArray(unserialize(base64_decode($query)), null, false); // see bug 31271
+ $searchForm->populateFromArray(unserialize(base64_decode($query)), null, true); // see bug 31271
$this->searchFields = $searchForm->searchFields;
$where_clauses = $searchForm->generateSearchWhere(true, $module);
if (count($where_clauses) > 0 ) {
12 include/Popups/PopupSmarty.php
View
@@ -194,8 +194,18 @@ function display($end = true) {
$associated_row_data = array();
- foreach($this->data['data'] as $val){
+
+ //C.L. - Bug 44324 - Override the NAME entry to not display salutation so that the data returned from the popup can be searched on correctly
+ $searchNameOverride = !empty($this->seed) && $this->seed instanceof Person && (isset($this->data['data'][0]['FIRST_NAME']) && isset($this->data['data'][0]['LAST_NAME'])) ? true : false;
+
+ global $locale;
+ foreach($this->data['data'] as $val)
+ {
$associated_row_data[$val['ID']] = $val;
+ if($searchNameOverride)
+ {
+ $associated_row_data[$val['ID']]['NAME'] = $locale->getLocaleFormattedName($val['FIRST_NAME'], $val['LAST_NAME']);
+ }
}
$is_show_fullname = showFullName() ? 1 : 0;
$json = getJSONobj();
29 include/QuickSearchDefaults.php
View
@@ -117,35 +117,6 @@ function getQSAccount($nameKey, $idKey, $billingKey = null, $shippingKey = null,
return $qsParent;
}
- /**
- * getQSContact
- * This is a customized method to handle returning in JSON notation the QuickSearch formats
- * for searching the Contacts module for a contact name. The method takes into account
- * the locale settings (s = salutation, f = first name, l = last name) that are permissible.
- * It should be noted though that any other characters present in the formatting will render
- * this widget non-functional.
- * @return The JSON format of a QuickSearch definition for the Contacts module
- */
- function getQSContact($name, $idName) {
- global $app_strings, $locale;
-
- $qsContact = array('form' => $this->form_name,
- 'method'=>'get_contact_array',
- 'modules'=>array('Contacts'),
- 'field_list' => array('salutation', 'first_name', 'last_name', 'id'),
- 'populate_list' => array($name, $idName, $idName, $idName),
- 'required_list' => array($idName),
- 'group' => 'or',
- 'conditions' => array(
- array('name'=>'first_name', 'op'=>'like_custom','end'=>'%','value'=>''),
- array('name'=>'last_name', 'op'=>'like_custom','end'=>'%','value'=>'')
- ),
- 'order'=>'last_name',
- 'limit'=>'30',
- 'no_match_text'=> $app_strings['ERR_SQS_NO_MATCH']);
- return $qsContact;
- }
-
function getQSUser($p_name = 'assigned_user_name', $p_id ='assigned_user_id') {
global $app_strings;
43 include/SugarCache/SugarCache.php
View
@@ -92,6 +92,40 @@ public static function instance()
return self::$_cacheInstance;
}
+
+ /**
+ * Try to reset any opcode caches we know about
+ *
+ * @todo make it so developers can extend this somehow
+ */
+ public static function cleanOpcodes()
+ {
+ // APC
+ if ( function_exists('apc_clear_cache') ) {
+ apc_clear_cache();
+ }
+ // Wincache
+ if ( function_exists('wincache_refresh_if_changed') ) {
+ wincache_refresh_if_changed();
+ }
+ // Zend
+ if ( function_exists('accelerator_reset') ) {
+ accelerator_reset();
+ }
+ // eAccelerator
+ if ( function_exists('eaccelerator_clear') ) {
+ eaccelerator_clear();
+ }
+ // XCache
+ if ( function_exists('xcache_clear_cache') && !ini_get('xcache.admin.enable_auth') ) {
+ $max = xcache_count(XC_TYPE_PHP);
+ for ($i = 0; $i < $max; $i++) {
+ if (!xcache_clear_cache(XC_TYPE_PHP, $i)) {
+ break;
+ }
+ }
+ }
+ }
}
/**
@@ -139,6 +173,15 @@ function sugar_cache_clear($key)
function sugar_cache_reset()
{
SugarCache::instance()->reset();
+ SugarCache::cleanOpcodes();
+}
+
+/**
+ * Clean out whatever opcode cache we may have out there.
+ */
+function sugar_clean_opcodes()
+{
+ SugarCache::cleanOpcodes();
}
/**
28 include/SugarCharts/Jit/js/Jit/jit.js
View
@@ -120,11 +120,11 @@ $jit.Canvas=Canvas=new Class({canvases:[],pos:false,element:false,labelContainer
var len=this.canvases.length;while(len--){this.element.appendChild(this.canvases[len].canvas);if(len>0){this.canvases[len].plot();}}
this.element.appendChild(this.labelContainer);wrapper.appendChild(this.element);var timer=null,that=this;$.addEvent(window,'scroll',function(){clearTimeout(timer);timer=setTimeout(function(){that.getPos(true);},500);});$.addEvent(window,'click',function(){clearTimeout(timer);timer=setTimeout(function(){that.getPos(true);},500);});sb=document.getElementById('sb'+id);$.addEvent(sb,'scroll',function(){clearTimeout(timer);timer=setTimeout(function(){that.getPos(true);},500);});},getCtx:function(i){return this.canvases[i||0].getCtx();},getConfig:function(){return this.opt;},getElement:function(){return this.element;},getSize:function(i){return this.canvases[i||0].getSize();},resize:function(width,height){this.getPos(true);this.translateOffsetX=this.translateOffsetY=0;this.scaleOffsetX=this.scaleOffsetY=1;for(var i=0,l=this.canvases.length;i<l;i++){this.canvases[i].resize(width,height);}
var style=this.element.style;style.width=width+'px';style.height=height+'px';if(this.labelContainer)
-this.labelContainer.style.width=width+'px';},translate:function(x,y,disablePlot){this.translateOffsetX+=x*this.scaleOffsetX;this.translateOffsetY+=y*this.scaleOffsetY;for(var i=0,l=this.canvases.length;i<l;i++){this.canvases[i].translate(x,y,disablePlot);}},scale:function(x,y,disablePlot){var px=this.scaleOffsetX*x,py=this.scaleOffsetY*y;var dx=this.translateOffsetX*(x-1)/px,dy=this.translateOffsetY*(y-1)/py;this.scaleOffsetX=px;this.scaleOffsetY=py;for(var i=0,l=this.canvases.length;i<l;i++){this.canvases[i].scale(x,y,true);}
-this.translate(dx,dy,false);},getPos:function(force){if(force||!this.pos){return this.pos=$.getPos(this.getElement());}
+this.labelContainer.style.width=width+'px';},translate:function(x,y,disablePlot){this.translateOffsetX+=x*this.scaleOffsetX;this.translateOffsetY+=y*this.scaleOffsetY;for(var i=0,l=this.canvases.length;i<l;i++){this.canvases[i].translate(x,y,disablePlot);}},scale:function(x,y,disablePlot){if(!disablePlot){disablePlot=false;}
+var px=this.scaleOffsetX*x,py=this.scaleOffsetY*y;var dx=this.translateOffsetX*(x-1)/px,dy=this.translateOffsetY*(y-1)/py;this.scaleOffsetX=px;this.scaleOffsetY=py;for(var i=0,l=this.canvases.length;i<l;i++){this.canvases[i].scale(x,y,true);}
+this.translate(dx,dy,disablePlot);},getPos:function(force){if(force||!this.pos){return this.pos=$.getPos(this.getElement());}
return this.pos;},clear:function(i){this.canvases[i||0].clear();},path:function(type,action){var ctx=this.canvases[0].getCtx();ctx.beginPath();action(ctx);ctx[type]();ctx.closePath();},createLabelContainer:function(type,idLabel,dim){var NS='http://www.w3.org/2000/svg';if(type=='HTML'||type=='Native'){return $E('div',{'id':idLabel,'style':{'overflow':'visible','position':'absolute','top':0,'left':0,'width':dim.width+'px','height':0}});}else if(type=='SVG'){var svgContainer=document.createElementNS(NS,'svg:svg');svgContainer.setAttribute("width",dim.width);svgContainer.setAttribute('height',dim.height);var style=svgContainer.style;style.position='absolute';style.left=style.top='0px';var labelContainer=document.createElementNS(NS,'svg:g');labelContainer.setAttribute('width',dim.width);labelContainer.setAttribute('height',dim.height);labelContainer.setAttribute('x',0);labelContainer.setAttribute('y',0);labelContainer.setAttribute('id',idLabel);svgContainer.appendChild(labelContainer);return svgContainer;}}});Canvas.Base=new Class({translateOffsetX:0,translateOffsetY:0,scaleOffsetX:1,scaleOffsetY:1,initialize:function(viz){this.viz=viz;this.opt=viz.config;this.size=false;this.createCanvas();this.translateToCenter();},createCanvas:function(){var opt=this.opt,width=opt.width,height=opt.height;this.canvas=$E('canvas',{'id':opt.injectInto+opt.idSuffix,'width':width,'height':height,'style':{'position':'absolute','top':0,'left':0,'width':width+'px','height':height+'px'}});},getCtx:function(){if(!this.ctx)
-return this.ctx=this.canvas.getContext('2d');return this.ctx;},getSize:function(){if(this.size)return this.size;var canvas=this.canvas;return this.size={width:canvas.width,height:canvas.height};},translateToCenter:function(ps){var size=this.getSize(),width=ps?(size.width-ps.width-this.translateOffsetX*2):size.width;height=ps?(size.height-ps.height-this.translateOffsetY*2):size.height;var ctx=this.getCtx();ps&&ctx.scale(1/this.scaleOffsetX,1/this.scaleOffsetY);ctx.translate(width/2,height/2);},resize:function(width,height){var size=this.getSize(),canvas=this.canvas,styles=canvas.style;this.size=false;canvas.width=width;canvas.height=height;styles.width=width+"px";styles.height=height+"px";if(!supportsCanvas){this.translateToCenter(size);}else{this.translateToCenter();}
-this.translateOffsetX=this.translateOffsetY=0;this.scaleOffsetX=this.scaleOffsetY=1;this.clear();this.viz.resize(width,height,this);},translate:function(x,y,disablePlot){var sx=this.scaleOffsetX,sy=this.scaleOffsetY;this.translateOffsetX+=x*sx;this.translateOffsetY+=y*sy;this.getCtx().translate(x,y);!disablePlot&&this.plot();},scale:function(x,y,disablePlot){this.scaleOffsetX*=x;this.scaleOffsetY*=y;this.getCtx().scale(x,y);!disablePlot&&this.plot();},clear:function(){var size=this.getSize(),ox=this.translateOffsetX,oy=this.translateOffsetY,sx=this.scaleOffsetX,sy=this.scaleOffsetY;this.getCtx().clearRect((-size.width/2-ox)*1/sx,(-size.height/2-oy)*1/sy,size.width*1/sx,size.height*1/sy);},plot:function(){this.clear();this.viz.plot(this);}});Canvas.Background={};Canvas.Background.Circles=new Class({initialize:function(viz,options){this.viz=viz;this.config=$.merge({idSuffix:'-bkcanvas',levelDistance:100,numberOfCircles:6,CanvasStyles:{},offset:0},options);},resize:function(width,height,base){this.plot(base);},plot:function(base){var canvas=base.canvas,ctx=base.getCtx(),conf=this.config,styles=conf.CanvasStyles;for(var s in styles)ctx[s]=styles[s];var n=conf.numberOfCircles,rho=conf.levelDistance;for(var i=1;i<=n;i++){ctx.beginPath();ctx.arc(0,0,rho*i,0,2*Math.PI,false);ctx.stroke();ctx.closePath();}}});Canvas.Background.Fade=new Class({initialize:function(viz,options){this.viz=viz;this.config=$.merge({idSuffix:'-bkcanvas',CanvasStyles:{},offset:0},options);},resize:function(width,height,base){this.plot(base);},plot:function(base){var canvas=base.canvas,ctx=base.getCtx(),conf=this.config,styles=conf.CanvasStyles,size=base.getSize();ctx.fillStyle='rgb(255,255,255)';ctx.fillRect(-size.width/2,-size.height/2,size.width,size.height);}});})();var Polar=function(theta,rho){this.theta=theta;this.rho=rho;};$jit.Polar=Polar;Polar.prototype={getc:function(simple){return this.toComplex(simple);},getp:function(){return this;},set:function(v){v=v.getp();this.theta=v.theta;this.rho=v.rho;},setc:function(x,y){this.rho=Math.sqrt(x*x+y*y);this.theta=Math.atan2(y,x);if(this.theta<0)this.theta+=Math.PI*2;},setp:function(theta,rho){this.theta=theta;this.rho=rho;},clone:function(){return new Polar(this.theta,this.rho);},toComplex:function(simple){var x=Math.cos(this.theta)*this.rho;var y=Math.sin(this.theta)*this.rho;if(simple)return{'x':x,'y':y};return new Complex(x,y);},add:function(polar){return new Polar(this.theta+polar.theta,this.rho+polar.rho);},scale:function(number){return new Polar(this.theta,this.rho*number);},equals:function(c){return this.theta==c.theta&&this.rho==c.rho;},$add:function(polar){this.theta=this.theta+polar.theta;this.rho+=polar.rho;return this;},$madd:function(polar){this.theta=(this.theta+polar.theta)%(Math.PI*2);this.rho+=polar.rho;return this;},$scale:function(number){this.rho*=number;return this;},interpolate:function(elem,delta){var pi=Math.PI,pi2=pi*2;var ch=function(t){var a=(t<0)?(t%pi2)+pi2:t%pi2;return a;};var tt=this.theta,et=elem.theta;var sum,diff=Math.abs(tt-et);if(diff==pi){if(tt>et){sum=ch((et+((tt-pi2)-et)*delta));}else{sum=ch((et-pi2+(tt-(et))*delta));}}else if(diff>=pi){if(tt>et){sum=ch((et+((tt-pi2)-et)*delta));}else{sum=ch((et-pi2+(tt-(et-pi2))*delta));}}else{sum=ch((et+(tt-et)*delta));}
+return this.ctx=this.canvas.getContext('2d');return this.ctx;},getSize:function(){if(this.size)return this.size;var canvas=this.canvas;return this.size={width:canvas.width,height:canvas.height};},translateToCenter:function(ps){var size=this.getSize(),width=ps?(size.width-ps.width-this.translateOffsetX*2):size.width;height=ps?(size.height-ps.height-this.translateOffsetY*2):size.height;var ctx=this.getCtx();ps&&ctx.scale(1/this.scaleOffsetX,1/this.scaleOffsetY);ctx.translate(width/2,height/2);},resize:function(width,height){var size=this.getSize(),canvas=this.canvas,styles=canvas.style;this.size=false;canvas.width=width;canvas.height=height;styles.width=width+"px";styles.height=height+"px";this.translateToCenter();this.translateOffsetX=this.translateOffsetY=0;this.scaleOffsetX=this.scaleOffsetY=1;this.clear();this.viz.resize(width,height,this);},translate:function(x,y,disablePlot){var sx=this.scaleOffsetX,sy=this.scaleOffsetY;this.translateOffsetX+=x*sx;this.translateOffsetY+=y*sy;this.getCtx().translate(x,y);!disablePlot&&this.plot();},scale:function(x,y,disablePlot){this.scaleOffsetX*=x;this.scaleOffsetY*=y;this.getCtx().scale(x,y);!disablePlot&&this.plot();},clear:function(){var size=this.getSize(),ox=this.translateOffsetX,oy=this.translateOffsetY,sx=this.scaleOffsetX,sy=this.scaleOffsetY;this.getCtx().clearRect((-size.width/2-ox)*1/sx,(-size.height/2-oy)*1/sy,size.width*1/sx,size.height*1/sy);},plot:function(){this.clear();this.viz.plot(this);}});Canvas.Background={};Canvas.Background.Circles=new Class({initialize:function(viz,options){this.viz=viz;this.config=$.merge({idSuffix:'-bkcanvas',levelDistance:100,numberOfCircles:6,CanvasStyles:{},offset:0},options);},resize:function(width,height,base){this.plot(base);},plot:function(base){var canvas=base.canvas,ctx=base.getCtx(),conf=this.config,styles=conf.CanvasStyles;for(var s in styles)ctx[s]=styles[s];var n=conf.numberOfCircles,rho=conf.levelDistance;for(var i=1;i<=n;i++){ctx.beginPath();ctx.arc(0,0,rho*i,0,2*Math.PI,false);ctx.stroke();ctx.closePath();}}});Canvas.Background.Fade=new Class({initialize:function(viz,options){this.viz=viz;this.config=$.merge({idSuffix:'-bkcanvas',CanvasStyles:{},offset:0},options);},resize:function(width,height,base){this.plot(base);},plot:function(base){var canvas=base.canvas,ctx=base.getCtx(),conf=this.config,styles=conf.CanvasStyles,size=base.getSize();ctx.fillStyle='rgb(255,255,255)';ctx.fillRect(-size.width/2,-size.height/2,size.width,size.height);}});})();var Polar=function(theta,rho){this.theta=theta;this.rho=rho;};$jit.Polar=Polar;Polar.prototype={getc:function(simple){return this.toComplex(simple);},getp:function(){return this;},set:function(v){v=v.getp();this.theta=v.theta;this.rho=v.rho;},setc:function(x,y){this.rho=Math.sqrt(x*x+y*y);this.theta=Math.atan2(y,x);if(this.theta<0)this.theta+=Math.PI*2;},setp:function(theta,rho){this.theta=theta;this.rho=rho;},clone:function(){return new Polar(this.theta,this.rho);},toComplex:function(simple){var x=Math.cos(this.theta)*this.rho;var y=Math.sin(this.theta)*this.rho;if(simple)return{'x':x,'y':y};return new Complex(x,y);},add:function(polar){return new Polar(this.theta+polar.theta,this.rho+polar.rho);},scale:function(number){return new Polar(this.theta,this.rho*number);},equals:function(c){return this.theta==c.theta&&this.rho==c.rho;},$add:function(polar){this.theta=this.theta+polar.theta;this.rho+=polar.rho;return this;},$madd:function(polar){this.theta=(this.theta+polar.theta)%(Math.PI*2);this.rho+=polar.rho;return this;},$scale:function(number){this.rho*=number;return this;},interpolate:function(elem,delta){var pi=Math.PI,pi2=pi*2;var ch=function(t){var a=(t<0)?(t%pi2)+pi2:t%pi2;return a;};var tt=this.theta,et=elem.theta;var sum,diff=Math.abs(tt-et);if(diff==pi){if(tt>et){sum=ch((et+((tt-pi2)-et)*delta));}else{sum=ch((et-pi2+(tt-(et))*delta));}}else if(diff>=pi){if(tt>et){sum=ch((et+((tt-pi2)-et)*delta));}else{sum=ch((et-pi2+(tt-(et-pi2))*delta));}}else{sum=ch((et+(tt-et)*delta));}
var r=(this.rho-elem.rho)*delta+elem.rho;return{'theta':sum,'rho':r};}};var $P=function(a,b){return new Polar(a,b);};Polar.KER=$P(0,0);var Complex=function(x,y){this.x=x;this.y=y;};$jit.Complex=Complex;Complex.prototype={getc:function(){return this;},getp:function(simple){return this.toPolar(simple);},set:function(c){c=c.getc(true);this.x=c.x;this.y=c.y;},setc:function(x,y){this.x=x;this.y=y;},setp:function(theta,rho){this.x=Math.cos(theta)*rho;this.y=Math.sin(theta)*rho;},clone:function(){return new Complex(this.x,this.y);},toPolar:function(simple){var rho=this.norm();var atan=Math.atan2(this.y,this.x);if(atan<0)atan+=Math.PI*2;if(simple)return{'theta':atan,'rho':rho};return new Polar(atan,rho);},norm:function(){return Math.sqrt(this.squaredNorm());},squaredNorm:function(){return this.x*this.x+this.y*this.y;},add:function(pos){return new Complex(this.x+pos.x,this.y+pos.y);},prod:function(pos){return new Complex(this.x*pos.x-this.y*pos.y,this.y*pos.x+this.x*pos.y);},conjugate:function(){return new Complex(this.x,-this.y);},scale:function(factor){return new Complex(this.x*factor,this.y*factor);},equals:function(c){return this.x==c.x&&this.y==c.y;},$add:function(pos){this.x+=pos.x;this.y+=pos.y;return this;},$prod:function(pos){var x=this.x,y=this.y;this.x=x*pos.x-y*pos.y;this.y=y*pos.x+x*pos.y;return this;},$conjugate:function(){this.y=-this.y;return this;},$scale:function(factor){this.x*=factor;this.y*=factor;return this;},$div:function(pos){var x=this.x,y=this.y;var sq=pos.squaredNorm();this.x=x*pos.x+y*pos.y;this.y=y*pos.x-x*pos.y;return this.$scale(1/sq);}};var $C=function(a,b){return new Complex(a,b);};Complex.KER=$C(0,0);$jit.Graph=new Class({initialize:function(opt,Node,Edge,Label){var innerOptions={'complex':false,'Node':{}};this.Node=Node;this.Edge=Edge;this.Label=Label;this.opt=$.merge(innerOptions,opt||{});this.nodes={};this.edges={};var that=this;this.nodeList={};for(var p in Accessors){that.nodeList[p]=(function(p){return function(){var args=Array.prototype.slice.call(arguments);that.eachNode(function(n){n[p].apply(n,args);});};})(p);}},getNode:function(id){if(this.hasNode(id))return this.nodes[id];return false;},getByName:function(name){for(var id in this.nodes){var n=this.nodes[id];if(n.name==name)return n;}
return false;},getAdjacence:function(id,id2){if(id in this.edges){return this.edges[id][id2];}
return false;},addNode:function(obj){if(!this.nodes[obj.id]){var edges=this.edges[obj.id]={};this.nodes[obj.id]=new Graph.Node($.extend({'id':obj.id,'name':obj.name,'data':$.merge(obj.data||{},{}),'adjacencies':edges},this.opt.Node),this.opt.complex,this.Node,this.Edge,this.Label);}
@@ -249,7 +249,8 @@ wrapperStyle.width=aggregateStyle.width=labelStyle.width=domElement.style.width=
aggregateStyle.top=(-font-config.labelOffset)+'px';labelStyle.top=(config.labelOffset+leftAcum)+'px';domElement.style.top=parseInt(domElement.style.top,10)-leftAcum+'px';domElement.style.height=wrapperStyle.height=leftAcum+'px';labels.aggregate.innerHTML=acum;}}});var size=st.canvas.getSize(),margin=config.Margin;st.config.offsetY=-size.height/2+margin.bottom
+(config.showLabels&&(config.labelOffset+config.Label.size));st.config.offsetX=(margin.right-margin.left-config.labelOffset-config.Label.size)/2;this.st=st;this.canvas=this.st.canvas;},renderTitle:function(){var canvas=this.canvas,size=canvas.getSize(),config=this.config,margin=config.Margin,label=config.Label,title=config.Title;ctx=canvas.getCtx();ctx.fillStyle=title.color;ctx.textAlign='left';ctx.textBaseline='top';ctx.font=label.style+' bold '+' '+title.size+'px '+label.family;if(label.type=='Native'){ctx.fillText(title.text,-size.width/2+margin.left,-size.height/2+margin.top);}},renderTicks:function(){var canvas=this.canvas,size=canvas.getSize(),config=this.config,margin=config.Margin,ticks=config.Ticks,title=config.Title,subtitle=config.Subtitle,label=config.Label,maxValue=this.maxValue,maxTickValue=Math.ceil(maxValue*.1)*10;if(maxTickValue==maxValue){var length=maxTickValue.toString().length;maxTickValue=maxTickValue+parseInt(pad(1,length));}
labelValue=0,labelIncrement=maxTickValue/ticks.segments,ctx=canvas.getCtx();ctx.strokeStyle=ticks.color;ctx.font=label.style+' '+label.size+'px '+label.family;ctx.textAlign='center';ctx.textBaseline='middle';idLabel=canvas.id+"-label";labelDim=100;container=document.getElementById(idLabel);var axis=(size.height/2)-(margin.bottom+config.labelOffset+label.size+(subtitle.text?subtitle.size+subtitle.offset:0)),htmlOrigin=size.height-(margin.bottom+config.labelOffset+label.size+(subtitle.text?subtitle.size+subtitle.offset:0)),grid=-size.height+(margin.bottom+config.labelOffset+label.size+margin.top+(title.text?title.size+title.offset:0)+(subtitle.text?subtitle.size+subtitle.offset:0)),segmentLength=grid/ticks.segments;ctx.fillStyle=ticks.color;ctx.fillRect(-(size.width/2)+margin.left+config.labelOffset+label.size-1,-(size.height/2)+margin.top+(title.text?title.size+title.offset:0),1,size.height-margin.top-margin.bottom-label.size-config.labelOffset-(title.text?title.size+title.offset:0)-(subtitle.text?subtitle.size+subtitle.offset:0));while(axis>=grid){ctx.save();ctx.translate(-(size.width/2)+margin.left,Math.round(axis));ctx.rotate(Math.PI/2);ctx.fillStyle=label.color;if(config.showLabels){if(label.type=='Native'){ctx.fillText(labelValue,0,0);}else{labelDiv=document.createElement('div');labelDiv.innerHTML=labelValue;labelDiv.className="rotatedLabel";labelDiv.style.top=(htmlOrigin-(labelDim/2))+"px";labelDiv.style.left=margin.left+"px";labelDiv.style.width=labelDim+"px";labelDiv.style.height=labelDim+"px";labelDiv.style.textAlign="center";labelDiv.style.verticalAlign="middle";labelDiv.style.position="absolute";container.appendChild(labelDiv);}}
-ctx.restore();ctx.fillStyle=ticks.color;ctx.fillRect(-(size.width/2)+margin.left+config.labelOffset+label.size,Math.round(axis),size.width-margin.right-margin.left-config.labelOffset-label.size,1);htmlOrigin+=segmentLength;axis+=segmentLength;labelValue+=labelIncrement;}},renderBackground:function(){var canvas=this.canvas,config=this.config,backgroundColor=config.backgroundColor,size=canvas.getSize(),ctx=canvas.getCtx();ctx.fillStyle=backgroundColor;ctx.fillRect(-size.width/2,-size.height/2,size.width,size.height);},loadJSON:function(json){var prefix=$.time(),ch=[],st=this.st,name=$.splat(json.label),color=$.splat(json.color||this.colors),config=this.config,ticks=config.Ticks,renderBackground=config.renderBackground,gradient=!!config.type.split(":")[1],animate=config.animate,title=config.Title,groupTotalValue=0;var valArrayAll=new Array();for(var i=0,values=json.values,l=values.length;i<l;i++){var val=values[i];var valArray=$.splat(val.values);for(var j=0,len=valArray.length;j<len;j++){valArrayAll.push(parseInt(valArray[j]));}
+ctx.restore();ctx.fillStyle=ticks.color;ctx.fillRect(-(size.width/2)+margin.left+config.labelOffset+label.size,Math.round(axis),size.width-margin.right-margin.left-config.labelOffset-label.size,1);htmlOrigin+=segmentLength;axis+=segmentLength;labelValue+=labelIncrement;}},renderBackground:function(){var canvas=this.canvas,config=this.config,backgroundColor=config.backgroundColor,size=canvas.getSize(),ctx=canvas.getCtx();ctx.fillStyle=backgroundColor;ctx.fillRect(-size.width/2,-size.height/2,size.width,size.height);},clear:function(){var canvas=this.canvas;var ctx=canvas.getCtx(),size=canvas.getSize();ctx.fillStyle="rgba(255,255,255,0)";ctx.fillRect(-size.width/2,-size.height/2,size.width,size.height);ctx.clearRect(-size.width/2,-size.height/2,size.width,size.height);},resizeGraph:function(json,orgWindowWidth,orgContainerDivWidth,cols){var canvas=this.canvas,size=canvas.getSize(),config=this.config,orgHeight=size.height,margin=config.Margin,st=this.st,horz=config.orientation=='horizontal';var newWindowWidth=document.body.offsetWidth;var diff=newWindowWidth-orgWindowWidth;var newWidth=orgContainerDivWidth+(diff/cols);canvas.resize(newWidth,orgHeight);if(typeof FlashCanvas=="undefined"){canvas.clear();}else{this.clear();}
+this.loadJSON(json);},loadJSON:function(json){var prefix=$.time(),ch=[],st=this.st,name=$.splat(json.label),color=$.splat(json.color||this.colors),config=this.config,ticks=config.Ticks,renderBackground=config.renderBackground,gradient=!!config.type.split(":")[1],animate=config.animate,title=config.Title,groupTotalValue=0;var valArrayAll=new Array();for(var i=0,values=json.values,l=values.length;i<l;i++){var val=values[i];var valArray=$.splat(val.values);for(var j=0,len=valArray.length;j<len;j++){valArrayAll.push(parseInt(valArray[j]));}
groupTotalValue+=parseInt(valArray.sum());}
this.maxValue=Math.max.apply(null,valArrayAll);for(var i=0,values=json.values,l=values.length;i<l;i++){var val=values[i],prev=values[i-1];var next=(i+1<l)?values[i+1]:0;var valLeft=$.splat(values[i].values);var valRight=(i+1<l)?$.splat(values[i+1].values):0;var valArray=$.zip(valLeft,valRight);var valArrayCur=$.splat(values[i].values);var linkArray=$.splat(values[i].links);var acumLeft=0,acumRight=0;var lastNode=(l-1==i)?true:false;ch.push({'id':prefix+val.label,'name':val.label,'data':{'value':valArray,'$valueArray':valArray,'$valArrayCur':valArrayCur,'$colorArray':color,'$linkArray':linkArray,'$stringArray':name,'$next':next?next.label:false,'$prev':prev?prev.label:false,'$config':config,'$lastNode':lastNode,'$groupTotalValue':groupTotalValue,'$gradient':gradient},'children':[]});}
var root={'id':prefix+'$root','name':'','data':{'$type':'none','$width':1,'$height':1},'children':ch};st.loadJSON(root);this.normalizeDims();if(renderBackground){this.renderBackground();}
@@ -347,7 +348,9 @@ if(horz){st.config.offsetX=size.width/2-margin.left-(grouped&&config.Label?confi
this.st=st;this.canvas=this.st.canvas;},renderTitle:function(){var canvas=this.canvas,size=canvas.getSize(),config=this.config,margin=config.Margin,label=config.Label,title=config.Title;ctx=canvas.getCtx();ctx.fillStyle=title.color;ctx.textAlign='left';ctx.font=label.style+' bold '+' '+title.size+'px '+label.family;if(label.type=='Native'){ctx.fillText(title.text,-size.width/2+margin.left,-size.height/2+margin.top);}},renderSubtitle:function(){var canvas=this.canvas,size=canvas.getSize(),config=this.config,margin=config.Margin,label=config.Label,subtitle=config.Subtitle,nodeCount=config.nodeCount,horz=config.orientation=='horizontal'?true:false,ctx=canvas.getCtx();ctx.fillStyle=title.color;ctx.textAlign='left';ctx.font=label.style+' '+subtitle.size+'px '+label.family;if(label.type=='Native'){ctx.fillText(subtitle.text,-size.width/2+margin.left,size.height/2-(!horz&&nodeCount>8?20:margin.bottom)-subtitle.size);}},renderScrollNote:function(){var canvas=this.canvas,size=canvas.getSize(),config=this.config,margin=config.Margin,label=config.Label,note=config.ScrollNote;ctx=canvas.getCtx();ctx.fillStyle=title.color;title=config.Title;ctx.textAlign='center';ctx.font=label.style+' bold '+' '+note.size+'px '+label.family;if(label.type=='Native'){ctx.fillText(note.text,0,-size.height/2+margin.top+title.size);}},renderTicks:function(){var canvas=this.canvas,size=canvas.getSize(),config=this.config,margin=config.Margin,ticks=config.Ticks,title=config.Title,subtitle=config.Subtitle,label=config.Label,shadow=config.shadow;horz=config.orientation=='horizontal',maxValue=this.getMaxValue(),maxTickValue=Math.ceil(maxValue*.1)*10;if(maxTickValue==maxValue){var length=maxTickValue.toString().length;maxTickValue=maxTickValue+parseInt(pad(1,length));}
grouped=config.type.split(':')[0]=='grouped',labelValue=0,labelIncrement=maxTickValue/ticks.segments,ctx=canvas.getCtx();ctx.strokeStyle=ticks.color;ctx.font=label.style+' '+label.size+'px '+label.family;ctx.textAlign='center';ctx.textBaseline='middle';idLabel=canvas.id+"-label";labelDim=100;container=document.getElementById(idLabel);if(horz){var axis=-(size.width/2)+margin.left+(grouped&&config.Label?config.labelOffset+label.size:0),grid=size.width-(margin.left+margin.right+(grouped&&config.Label?config.labelOffset+label.size:0)),segmentLength=grid/ticks.segments;ctx.fillStyle=ticks.color;ctx.fillRect(axis,(size.height/2)-margin.bottom-config.labelOffset-label.size-(subtitle.text?subtitle.size+subtitle.offset:0)+(shadow.enable?shadow.size:0),size.width-margin.left-margin.right-(grouped&&config.Label?config.labelOffset+label.size:0),1);while(axis<=grid){ctx.fillStyle=ticks.color;lineHeight=size.height-margin.bottom-margin.top-config.labelOffset-label.size-(title.text?title.size+title.offset:0)-(subtitle.text?subtitle.size+subtitle.offset:0);ctx.fillRect(Math.round(axis),-(size.height/2)+margin.top+(title.text?title.size+title.offset:0)-(shadow.enable?shadow.size:0),1,lineHeight+(shadow.enable?shadow.size*2:0));ctx.fillStyle=label.color;if(label.type=='Native'&&config.showLabels){ctx.fillText(labelValue,Math.round(axis),-(size.height/2)+margin.top+(title.text?title.size+title.offset:0)+config.labelOffset+lineHeight+label.size);}
axis+=segmentLength;labelValue+=labelIncrement;}}else{var axis=(size.height/2)-(margin.bottom+config.labelOffset+label.size+(subtitle.text?subtitle.size+subtitle.offset:0)),htmlOrigin=size.height-(margin.bottom+config.labelOffset+label.size+(subtitle.text?subtitle.size+subtitle.offset:0)),grid=-size.height+(margin.bottom+config.labelOffset+label.size+margin.top+(title.text?title.size+title.offset:0)+(subtitle.text?subtitle.size+subtitle.offset:0)),segmentLength=grid/ticks.segments;ctx.fillStyle=ticks.color;ctx.fillRect(-(size.width/2)+margin.left+config.labelOffset+label.size-1,-(size.height/2)+margin.top+(title.text?title.size+title.offset:0),1,size.height-margin.top-margin.bottom-label.size-config.labelOffset-(title.text?title.size+title.offset:0)-(subtitle.text?subtitle.size+subtitle.offset:0));while(axis>=grid){ctx.save();ctx.translate(-(size.width/2)+margin.left,Math.round(axis));ctx.rotate(0*Math.PI/180);ctx.fillStyle=label.color;if(config.showLabels){if(label.type=='Native'){ctx.fillText(labelValue,0,0);}else{labelDiv=document.createElement('div');labelDiv.innerHTML=labelValue;labelDiv.className="rotatedLabel";labelDiv.style.top=(htmlOrigin-(labelDim/2))+"px";labelDiv.style.left=margin.left+"px";labelDiv.style.width=labelDim+"px";labelDiv.style.height=labelDim+"px";labelDiv.style.textAlign="center";labelDiv.style.verticalAlign="middle";labelDiv.style.position="absolute";container.appendChild(labelDiv);}}
-ctx.restore();ctx.fillStyle=ticks.color;ctx.fillRect(-(size.width/2)+margin.left+config.labelOffset+label.size,Math.round(axis),size.width-margin.right-margin.left-config.labelOffset-label.size,1);htmlOrigin+=segmentLength;axis+=segmentLength;labelValue+=labelIncrement;}}},renderBackground:function(){var canvas=this.canvas,config=this.config,backgroundColor=config.backgroundColor,size=canvas.getSize(),ctx=canvas.getCtx();ctx.fillStyle=backgroundColor;ctx.fillRect(-size.width/2,-size.height/2,size.width,size.height);},loadJSON:function(json){if(this.busy)return;this.busy=true;var prefix=$.time(),ch=[],st=this.st,name=$.splat(json.label),color=$.splat(json.color||this.colors),config=this.config,gradient=!!config.type.split(":")[1],renderBackground=config.renderBackground,animate=config.animate,ticks=config.Ticks,title=config.Title,note=config.ScrollNote,subtitle=config.Subtitle,horz=config.orientation=='horizontal',that=this,colorLength=color.length,nameLength=name.length;groupTotalValue=0;for(var i=0,values=json.values,l=values.length;i<l;i++){var val=values[i];var valArray=$.splat(val.values);groupTotalValue+=parseInt(valArray.sum());}
+ctx.restore();ctx.fillStyle=ticks.color;ctx.fillRect(-(size.width/2)+margin.left+config.labelOffset+label.size,Math.round(axis),size.width-margin.right-margin.left-config.labelOffset-label.size,1);htmlOrigin+=segmentLength;axis+=segmentLength;labelValue+=labelIncrement;}}},renderBackground:function(){var canvas=this.canvas,config=this.config,backgroundColor=config.backgroundColor,size=canvas.getSize(),ctx=canvas.getCtx();ctx.fillStyle=backgroundColor;ctx.fillRect(-size.width/2,-size.height/2,size.width,size.height);},clear:function(){var canvas=this.canvas;var ctx=canvas.getCtx(),size=canvas.getSize();ctx.fillStyle="rgba(255,255,255,0)";ctx.fillRect(-size.width/2,-size.height/2,size.width,size.height);ctx.clearRect(-size.width/2,-size.height/2,size.width,size.height);},resizeGraph:function(json,orgWindowWidth,orgContainerDivWidth,cols){var canvas=this.canvas,size=canvas.getSize(),config=this.config,orgHeight=size.height,margin=config.Margin,st=this.st,grouped=config.type.split(':')[0]=='grouped',horz=config.orientation=='horizontal',ctx=canvas.getCtx();var newWindowWidth=document.body.offsetWidth;var diff=newWindowWidth-orgWindowWidth;var newWidth=orgContainerDivWidth+(diff/cols);var scale=newWidth/orgContainerDivWidth;canvas.resize(newWidth,orgHeight);if(typeof FlashCanvas=="undefined"){canvas.clear();}else{this.clear();}
+if(horz){st.config.offsetX=size.width/2-margin.left-(grouped&&config.Label?config.labelOffset+config.Label.size:0);}
+this.loadJSON(json);},loadJSON:function(json){if(this.busy)return;this.busy=true;var prefix=$.time(),ch=[],st=this.st,name=$.splat(json.label),color=$.splat(json.color||this.colors),config=this.config,gradient=!!config.type.split(":")[1],renderBackground=config.renderBackground,animate=config.animate,ticks=config.Ticks,title=config.Title,note=config.ScrollNote,subtitle=config.Subtitle,horz=config.orientation=='horizontal',that=this,colorLength=color.length,nameLength=name.length;groupTotalValue=0;for(var i=0,values=json.values,l=values.length;i<l;i++){var val=values[i];var valArray=$.splat(val.values);groupTotalValue+=parseFloat(valArray.sum());}
for(var i=0,values=json.values,l=values.length;i<l;i++){var val=values[i];var valArray=$.splat(values[i].values);var valuelabelArray=$.splat(values[i].valuelabels);var linkArray=$.splat(values[i].links);var titleArray=$.splat(values[i].titles);var barTotalValue=valArray.sum();var acum=0;ch.push({'id':prefix+val.label,'name':val.label,'data':{'value':valArray,'$linkArray':linkArray,'$gvl':val.gvaluelabel,'$titleArray':titleArray,'$valueArray':valArray,'$valuelabelArray':valuelabelArray,'$colorArray':color,'$colorMono':$.splat(color[i%colorLength]),'$stringArray':name,'$barTotalValue':barTotalValue,'$groupTotalValue':groupTotalValue,'$nodeCount':values.length,'$gradient':gradient,'$config':config},'children':[]});}
var root={'id':prefix+'$root','name':'','data':{'$type':'none','$width':1,'$height':1},'children':ch};st.loadJSON(root);this.normalizeDims();if(renderBackground){this.renderBackground();}
if(!animate&&ticks.enable){this.renderTicks();}
@@ -372,9 +375,10 @@ for(var i=0,l=dimArray.length,acum=(horz?x:y);i<l;i++){var dimi=dimArray[i];var
return false;}}});$jit.FunnelChart=new Class({st:null,colors:["#004b9c","#9c0079","#9c0033","#28009c","#9c0000","#7d009c","#001a9c","#00809c","#009c80","#009c42","#009c07","#469c00","#799c00","#9c9600","#9c5c00"],selected:{},busy:false,initialize:function(opt){this.controller=this.config=$.merge(Options("Canvas","Margin","Label","BarChart"),{Label:{type:'Native'}},opt);var showLabels=this.config.showLabels,typeLabels=$.type(showLabels),showAggregates=this.config.showAggregates,typeAggregates=$.type(showAggregates);this.config.showLabels=typeLabels=='function'?showLabels:$.lambda(showLabels);this.config.showAggregates=typeAggregates=='function'?showAggregates:$.lambda(showAggregates);Options.Fx.clearCanvas=false;this.initializeViz();},initializeViz:function(){var config=this.config,that=this;var nodeType=config.type.split(":")[0],horz=config.orientation=='horizontal',nodeLabels={};var st=new $jit.ST({injectInto:config.injectInto,orientation:horz?'left':'bottom',levelDistance:0,background:config.background,renderBackground:config.renderBackground,backgroundColor:config.backgroundColor,colorStop1:config.colorStop1,colorStop2:config.colorStop2,siblingOffset:config.segmentOffset,subtreeOffset:0,withLabels:config.Label.type!='Native',useCanvas:config.useCanvas,Label:{type:config.Label.type},Node:{overridable:true,type:'funnelchart-'+nodeType,align:'left',width:1,height:1},Edge:{type:'none'},Tips:{enable:config.Tips.enable,type:'Native',force:true,onShow:function(tip,node,contains){var elem=contains;config.Tips.onShow(tip,elem,node);if(elem.link!='undefined'&&elem.link!=''){document.body.style.cursor='pointer';}},onHide:function(call){document.body.style.cursor='default';}},Events:{enable:true,type:'Native',onClick:function(node,eventInfo,evt){if(!config.Events.enable)return;var elem=eventInfo.getContains();config.Events.onClick(elem,eventInfo,evt);},onMouseMove:function(node,eventInfo,evt){if(!config.hoveredColor)return;if(node){var elem=eventInfo.getContains();that.select(node.id,elem.name,elem.index);}else{that.select(false,false,false);}}},onCreateLabel:function(domElement,node){var labelConf=config.Label,valueArray=node.getData('valueArray'),idArray=node.getData('idArray'),valuelabelArray=node.getData('valuelabelArray'),stringArray=node.getData('stringArray');size=st.canvas.getSize()
prefix=$.time();for(var i=0,l=valueArray.length;i<l;i++){var nlbs={wrapper:document.createElement('div'),valueLabel:document.createElement('div'),label:document.createElement('div')};var wrapper=nlbs.wrapper,label=nlbs.label,valueLabel=nlbs.valueLabel,wrapperStyle=wrapper.style,labelStyle=label.style,valueLabelStyle=valueLabel.style;nodeLabels[idArray[i]]=nlbs;wrapper.appendChild(label);wrapper.appendChild(valueLabel);wrapperStyle.position='relative';wrapperStyle.overflow='visible';wrapperStyle.fontSize=labelConf.size+'px';wrapperStyle.fontFamily=labelConf.family;wrapperStyle.color=labelConf.color;wrapperStyle.textAlign='center';wrapperStyle.width=size.width+'px';valueLabelStyle.position=labelStyle.position='absolute';valueLabelStyle.left=labelStyle.left='0px';valueLabelStyle.width=(size.width/3)+'px';valueLabelStyle.textAlign='right';label.innerHTML=stringArray[i];valueLabel.innerHTML=valuelabelArray[i];domElement.id=prefix+'funnel';domElement.style.width=size.width+'px';domElement.appendChild(wrapper);}},onPlaceLabel:function(domElement,node){var dimArray=node.getData('dimArray'),idArray=node.getData('idArray'),valueArray=node.getData('valueArray'),valuelabelArray=node.getData('valuelabelArray'),stringArray=node.getData('stringArray');size=st.canvas.getSize(),pos=node.pos.getc(true),domElement.style.left="0px",domElement.style.top="0px",minWidth=node.getData('width')*.25,ratio=.65,pos=node.pos.getc(true),labelConf=config.Label;for(var i=0,l=valueArray.length,acum=0;i<l;i++){var labels=nodeLabels[idArray[i]],wrapperStyle=labels.wrapper.style,labelStyle=labels.label.style,valueLabelStyle=labels.valueLabel.style;var bottomWidth=minWidth+(acum*ratio);font=parseInt(wrapperStyle.fontSize,10),domStyle=domElement.style;wrapperStyle.top=(pos.y+size.height/2)-acum-labelConf.size+"px";valueLabelStyle.left=(size.width/2)-(bottomWidth/2)-config.labelOffset-(size.width/3)+'px';labelStyle.left=(size.width/2)+(bottomWidth/2)+config.labelOffset+'px';;acum+=(dimArray[i]||0);}}});var size=st.canvas.getSize(),margin=config.Margin;title=config.Title;subtitle=config.Subtitle;st.config.offsetY=-size.height/2+margin.bottom
+(config.showLabels&&(config.labelOffset+config.Label.size))+(subtitle.text?subtitle.size+subtitle.offset:0);st.config.offsetX=(margin.right-margin.left)/2;this.st=st;this.canvas=this.st.canvas;},renderTitle:function(){var canvas=this.canvas,size=canvas.getSize(),config=this.config,margin=config.Margin,label=config.Label,title=config.Title;ctx=canvas.getCtx();ctx.fillStyle=title.color;ctx.textAlign='left';ctx.font=label.style+' bold '+' '+title.size+'px '+label.family;if(label.type=='Native'){ctx.fillText(title.text,-size.width/2+margin.left,-size.height/2+margin.top);}},renderSubtitle:function(){var canvas=this.canvas,size=canvas.getSize(),config=this.config,margin=config.Margin,label=config.Label,subtitle=config.Subtitle;ctx=canvas.getCtx();ctx.fillStyle=title.color;ctx.textAlign='left';ctx.font=label.style+' '+subtitle.size+'px '+label.family;if(label.type==