Permalink
Browse files

Feed.sql Postgre: index should not be declared unique.

  • Loading branch information...
1 parent ac700e7 commit c4c102663813ecee23ab1a586e22c783d95e74de @cdujeu cdujeu committed May 7, 2016
Showing with 2,844 additions and 3,135 deletions.
  1. +25 −26 core/src/cmd.php
  2. +6 −6 core/src/conf/bootstrap_context.php
  3. +0 −105 core/src/conf/templates/bootstrap_plugins.bridges.php
  4. +0 −148 core/src/conf/templates/bootstrap_plugins.multi.php
  5. +0 −78 core/src/conf/templates/bootstrap_plugins.sql.php
  6. 0 core/src/core/{src → }/compat.php
  7. 0 core/src/core/src/{class.HttpClient.php → lib/HttpClient.php}
  8. +2 −2 core/src/core/src/{ → lib}/pclzip.lib.php
  9. +43 −35 core/src/core/src/{class.AJXP_Controller.php → pydio/Core/Controller/Controller.php}
  10. +6 −16 core/src/core/src/{class.HTMLWriter.php → pydio/Core/Controller/HTMLWriter.php}
  11. +2 −2 core/src/core/src/{class.AJXP_ProgressBarCLI.php → pydio/Core/Controller/ProgressBarCLI.php}
  12. +4 −4 core/src/core/src/{class.AJXP_ShutdownScheduler.php → pydio/Core/Controller/ShutdownScheduler.php}
  13. +65 −60 core/src/core/src/{class.AJXP_XMLWriter.php → pydio/Core/Controller/XMLWriter.php}
  14. +4 −4 core/src/core/src/{class.AJXP_Exception.php → pydio/Core/Exception/PydioException.php}
  15. +6 −4 core/src/core/src/{class.AJXP_PromptException.php → pydio/Core/Exception/PydioPromptException.php}
  16. +4 −2 ...c/core/src/{class.AJXP_UserAlertException.php → pydio/Core/Exception/PydioUserAlertException.php}
  17. +14 −13 core/src/core/src/{class.AJXP_Plugin.php → pydio/Core/PluginFramework/Plugin.php}
  18. +33 −32 core/src/core/src/{class.AJXP_PluginsService.php → pydio/Core/PluginFramework/PluginsService.php}
  19. +1 −1 core/src/core/src/{interface.SqlTableProvider.php → pydio/Core/PluginFramework/SqlTableProvider.php}
  20. +30 −29 core/src/core/src/{class.AuthService.php → pydio/Core/Services/AuthService.php}
  21. +1 −2 core/src/core/src/{class.CacheService.php → pydio/Core/Services/CacheService.php}
  22. +61 −58 core/src/core/src/{class.ConfService.php → pydio/Core/Services/ConfService.php}
  23. +7 −8 core/src/core/src/{class.AJXP_Cache.php → pydio/Core/Services/LocalCache.php}
  24. +11 −11 core/src/core/src/{class.CaptchaProvider.php → pydio/Core/Utils/CaptchaProvider.php}
  25. +6 −6 core/src/core/src/{class.AJXP_JSPacker.php → pydio/Core/Utils/JSPacker.php}
  26. +5 −3 core/src/core/src/{class.PydioSdkGenerator.php → pydio/Core/Utils/PydioSdkGenerator.php}
  27. +16 −16 core/src/core/src/{class.SystemTextEncoding.php → pydio/Core/Utils/TextEncoder.php}
  28. +1 −1 core/src/core/src/{class.UnixProcess.php → pydio/Core/Utils/UnixProcess.php}
  29. +36 −31 core/src/core/src/{class.AJXP_Utils.php → pydio/Core/Utils/Utils.php}
  30. +10 −8 core/src/core/src/{class.AJXP_VarsFilter.php → pydio/Core/Utils/VarsFilter.php}
  31. 0 core/src/core/src/{class.AbstractTest.php → pydio/Tests/AbstractTest.php}
  32. +2 −2 core/src/core/src/sabredav/ajaxplorer/class.AJXP_Sabre_AuthBackendBasic.php
  33. +2 −2 core/src/core/src/sabredav/ajaxplorer/class.AJXP_Sabre_AuthBackendDigest.php
  34. +1 −1 core/src/core/src/sabredav/ajaxplorer/class.AJXP_Sabre_BrowserPlugin.php
  35. +4 −4 core/src/core/src/sabredav/ajaxplorer/class.AJXP_Sabre_Collection.php
  36. +6 −6 core/src/core/src/sabredav/ajaxplorer/class.AJXP_Sabre_Node.php
  37. +3 −3 core/src/core/src/sabredav/ajaxplorer/class.AJXP_Sabre_NodeLeaf.php
  38. +4 −4 core/src/core/src/sabredav/ajaxplorer/class.AJXP_Sabre_RootCollection.php
  39. +2 −2 core/src/core/tests/test.PHPCLI.php
  40. +1 −1 core/src/core/tests/test.Upload.php
  41. +2 −2 core/src/core/tests/test.UsersConfig.php
  42. +2 −2 core/src/core/tests/test.Writeability.php
  43. +6 −6 core/src/dav.php
  44. +23 −22 core/src/index.php
  45. +4 −4 core/src/opencollab.php
  46. +293 −293 core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php
  47. +1 −1 core/src/plugins/access.ajxp_home/class.HomePagePlugin.php
  48. +38 −38 core/src/plugins/access.ajxp_user/class.UserDashboardDriver.php
  49. +3 −3 core/src/plugins/access.demo/class.demoAccessDriver.php
  50. +9 −9 core/src/plugins/access.dropbox/class.dropboxAccessDriver.php
  51. +5 −5 core/src/plugins/access.dropbox/class.dropboxWrapper.php
  52. +144 −144 core/src/plugins/access.fs/class.fsAccessDriver.php
  53. +15 −15 core/src/plugins/access.fs/class.fsAccessWrapper.php
  54. +25 −25 core/src/plugins/access.ftp/class.ftpAccessDriver.php
  55. +27 −27 core/src/plugins/access.ftp/class.ftpAccessWrapper.php
  56. +4 −5 core/src/plugins/access.imap/class.imapAccessDriver.php
  57. +6 −6 core/src/plugins/access.imap/class.imapAccessWrapper.php
  58. +10 −10 core/src/plugins/access.inbox/class.inboxAccessDriver.php
  59. +6 −6 core/src/plugins/access.inbox/class.inboxAccessWrapper.php
  60. +4 −4 core/src/plugins/access.jsapi/class.jsapiAccessDriver.php
  61. +42 −42 core/src/plugins/access.mysql/class.mysqlAccessDriver.php
  62. +20 −20 core/src/plugins/access.remote_fs/class.remote_fsAccessDriver.php
  63. +14 −14 core/src/plugins/access.remote_fs/class.remote_fsAccessWrapper.php
  64. +4 −4 core/src/plugins/access.s3/class.s3AccessDriver.php
  65. +4 −4 core/src/plugins/access.s3/class.s3AccessWrapper.php
  66. +1 −1 core/src/plugins/access.s3/class.s3CacheService.php
  67. +8 −8 core/src/plugins/access.sftp/class.sftpAccessDriver.php
  68. +9 −9 core/src/plugins/access.sftp/class.sftpAccessWrapper.php
  69. +3 −3 core/src/plugins/access.sftp_psl/class.sftpPSLAccessDriver.php
  70. +7 −7 core/src/plugins/access.sftp_psl/class.sftpPSLAccessWrapper.php
  71. +9 −9 core/src/plugins/access.smb/class.smbAccessDriver.php
  72. +5 −5 core/src/plugins/access.smb/class.smbAccessWrapper.php
  73. +3 −1 core/src/plugins/access.smb/smb.php
  74. +2 −2 core/src/plugins/access.swift/class.swiftAccessDriver.php
  75. +5 −5 core/src/plugins/access.swift/class.swiftAccessWrapper.php
  76. +2 −2 core/src/plugins/access.webdav/src/Driver.php
  77. +7 −7 core/src/plugins/access.wms/class.WmsBrowser.php
  78. +4 −5 core/src/plugins/action.antivirus/class.AntivirusScanner.php
  79. +4 −4 core/src/plugins/action.avatar/class.AvatarProvider.php
  80. +7 −7 core/src/plugins/action.cart/class.CartManager.php
  81. +54 −54 core/src/plugins/action.compression/class.PluginCompression.php
  82. +11 −11 core/src/plugins/action.disclaimer/class.DisclaimerProvider.php
  83. +29 −29 core/src/plugins/action.powerfs/class.PowerFSController.php
  84. +40 −40 core/src/plugins/action.scheduler/class.AjxpScheduler.php
  85. +4 −4 core/src/plugins/action.share/class.CompositeShare.php
  86. +15 −15 core/src/plugins/action.share/class.LegacyPubliclet.php
  87. +20 −20 core/src/plugins/action.share/class.MinisiteRenderer.php
  88. +8 −8 core/src/plugins/action.share/class.PublicAccessManager.php
  89. +4 −4 core/src/plugins/action.share/class.PublicletCounter.php
  90. +63 −63 core/src/plugins/action.share/class.ShareCenter.php
  91. +4 −4 core/src/plugins/action.share/class.ShareLink.php
  92. +1 −1 core/src/plugins/action.share/class.ShareMetaManager.php
  93. +9 −9 core/src/plugins/action.share/class.ShareRightsManager.php
  94. +12 −12 core/src/plugins/action.share/class.ShareStore.php
  95. +3 −3 core/src/plugins/action.skeleton/class.PluginSkeleton.php
  96. +13 −13 core/src/plugins/action.timestamp/class.TimestampCreator.php
  97. +6 −6 core/src/plugins/action.updater/class.AjaXplorerUpgrader.php
  98. +6 −6 core/src/plugins/action.updater/class.UpdateController.php
  99. +4 −4 core/src/plugins/auth.basic_http/class.basic_httpAuthDriver.php
  100. +3 −3 core/src/plugins/auth.cmsms/class.cmsmsAuthDriver.php
  101. +11 −11 core/src/plugins/auth.custom_db/class.customDbAuthDriver.php
  102. +8 −8 core/src/plugins/auth.ftp/class.ftpAuthDriver.php
  103. +7 −7 core/src/plugins/auth.ldap/class.ldapAuthDriver.php
  104. +4 −4 core/src/plugins/auth.multi/class.multiAuthDriver.php
  105. +1 −1 core/src/plugins/auth.phpbb/class.phpbbAuthDriver.php
  106. +5 −5 core/src/plugins/auth.radius/class.radiusAuthDriver.php
  107. +13 −13 core/src/plugins/auth.remote/class.remoteAuthDriver.php
  108. +7 −3 core/src/plugins/auth.remote/cms_auth_functions.php
  109. +1 −1 core/src/plugins/auth.remote/glueCode.php
  110. +2 −2 core/src/plugins/auth.remote_ajxp/class.remote_ajxpAuthDriver.php
  111. +13 −13 core/src/plugins/auth.serial/class.serialAuthDriver.php
  112. +6 −6 core/src/plugins/auth.smb/class.smbAuthDriver.php
  113. +12 −12 core/src/plugins/auth.sql/class.sqlAuthDriver.php
  114. +9 −9 core/src/plugins/authfront.cas/class.CasAuthFrontend.php
  115. +2 −2 core/src/plugins/authfront.cyphered/class.CypheredAuthFrontend.php
  116. +15 −15 core/src/plugins/authfront.duosecurity/class.DuoSecurityFrontend.php
  117. +1 −1 core/src/plugins/authfront.http_basic/class.BasicHttpAuthFrontend.php
  118. +1 −1 core/src/plugins/authfront.http_server/class.ServerHttpAuthFrontend.php
  119. +9 −9 core/src/plugins/authfront.keystore/class.KeystoreAuthFrontend.php
  120. +7 −7 core/src/plugins/authfront.otp/class.OtpAuthFrontend.php
  121. +16 −16 core/src/plugins/authfront.session_login/class.SessionLoginFrontend.php
  122. +31 −31 core/src/plugins/boot.conf/class.BootConfLoader.php
  123. +2 −2 core/src/plugins/cache.doctrine/class.DoctrineCacheDriver.php
  124. +20 −20 core/src/plugins/conf.serial/class.AJXP_SerialUser.php
  125. +46 −46 core/src/plugins/conf.serial/class.serialConfDriver.php
  126. +5 −5 core/src/plugins/conf.sql/class.AJXP_SqlUser.php
  127. +14 −14 core/src/plugins/conf.sql/class.sqlConfDriver.php
  128. +3 −3 core/src/plugins/core.access/src/AJXP_MetaStreamWrapper.php
  129. +12 −12 core/src/plugins/core.access/src/AJXP_Node.php
  130. +35 −35 core/src/plugins/core.access/src/AbstractAccessDriver.php
  131. +6 −6 core/src/plugins/core.access/src/ContentFilter.php
  132. +2 −2 core/src/plugins/core.access/src/Filter/AJXP_PermissionMask.php
  133. +16 −15 core/src/plugins/core.access/src/Repository.php
  134. +3 −3 core/src/plugins/core.access/src/Stream/AuthWrapper.php
  135. +10 −10 core/src/plugins/core.access/src/Stream/OAuthWrapper.php
  136. +3 −3 core/src/plugins/core.access/src/Stream/PathWrapper.php
  137. +4 −4 core/src/plugins/core.access/src/Stream/StreamWrapper.php
  138. +10 −10 core/src/plugins/core.access/src/UserSelection.php
  139. +1 −1 core/src/plugins/core.ajaxplorer/i18n/ca.php
  140. +1 −1 core/src/plugins/core.ajaxplorer/i18n/cs.php
  141. +1 −1 core/src/plugins/core.ajaxplorer/i18n/da.php
  142. +1 −1 core/src/plugins/core.ajaxplorer/i18n/de.php
  143. +1 −1 core/src/plugins/core.ajaxplorer/i18n/en.php
  144. +1 −1 core/src/plugins/core.ajaxplorer/i18n/es.php
  145. +1 −1 core/src/plugins/core.ajaxplorer/i18n/et.php
  146. +1 −1 core/src/plugins/core.ajaxplorer/i18n/eus.php
  147. +1 −1 core/src/plugins/core.ajaxplorer/i18n/fi.php
  148. +1 −1 core/src/plugins/core.ajaxplorer/i18n/fr.php
  149. +1 −1 core/src/plugins/core.ajaxplorer/i18n/gr.php
  150. +1 −1 core/src/plugins/core.ajaxplorer/i18n/he.php
  151. +1 −1 core/src/plugins/core.ajaxplorer/i18n/hu.php
  152. +1 −1 core/src/plugins/core.ajaxplorer/i18n/it.php
  153. +1 −1 core/src/plugins/core.ajaxplorer/i18n/ja.php
  154. +1 −1 core/src/plugins/core.ajaxplorer/i18n/kr.php
  155. +1 −1 core/src/plugins/core.ajaxplorer/i18n/nl.php
  156. +1 −1 core/src/plugins/core.ajaxplorer/i18n/no.php
  157. +1 −1 core/src/plugins/core.ajaxplorer/i18n/pl.php
  158. +1 −1 core/src/plugins/core.ajaxplorer/i18n/pt-br.php
  159. +1 −1 core/src/plugins/core.ajaxplorer/i18n/pt.php
  160. +1 −1 core/src/plugins/core.ajaxplorer/i18n/ru.php
  161. +1 −1 core/src/plugins/core.ajaxplorer/i18n/si.php
  162. +1 −1 core/src/plugins/core.ajaxplorer/i18n/sv.php
  163. +1 −1 core/src/plugins/core.ajaxplorer/i18n/tr.php
  164. +1 −1 core/src/plugins/core.ajaxplorer/i18n/zh-tw.php
  165. +1 −1 core/src/plugins/core.ajaxplorer/i18n/zh.php
  166. +4 −3 core/src/plugins/core.auth/class.AJXP_Safe.php
  167. +9 −8 core/src/plugins/core.auth/class.AbstractAuthDriver.php
  168. +6 −6 core/src/plugins/core.auth/class.CoreAuthLoader.php
  169. +2 −2 core/src/plugins/core.authfront/class.AbstractAuthFrontend.php
  170. +8 −8 core/src/plugins/core.authfront/class.FrontendsLoader.php
  171. +3 −3 core/src/plugins/core.cache/class.AbstractCacheDriver.php
  172. +1 −0 core/src/plugins/core.cache/class.CacheStreamLayer.php
  173. +10 −9 core/src/plugins/core.cache/class.CoreCacheLoader.php
  174. +9 −8 core/src/plugins/core.conf/class.AbstractAjxpUser.php
  175. +88 −87 core/src/plugins/core.conf/class.AbstractConfDriver.php
  176. +9 −8 core/src/plugins/core.conf/class.CoreConfLoader.php
  177. +5 −5 core/src/plugins/core.index/class.AbstractSearchEngineIndexer.php
  178. +25 −25 core/src/plugins/core.index/class.CoreIndexer.php
  179. +7 −7 core/src/plugins/core.log/class.AJXP_Logger.php
  180. +2 −2 core/src/plugins/core.log/class.AbstractLogDriver.php
  181. +28 −28 core/src/plugins/core.mailer/class.AjxpMailer.php
  182. +3 −3 core/src/plugins/core.meta/class.AJXP_AbstractMetaSource.php
  183. +25 −25 core/src/plugins/core.mq/class.MqManager.php
  184. +1 −0 core/src/plugins/core.mq/ws-server.php
  185. +5 −6 core/src/plugins/core.notifications/class.AJXP_Notification.php
  186. +26 −26 core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php
  187. +4 −4 core/src/plugins/core.ocs/ActionsController.php
  188. +6 −6 core/src/plugins/core.ocs/OCSPlugin.php
  189. +2 −2 core/src/plugins/core.ocs/src/Client/OCSClient.php
  190. +1 −1 core/src/plugins/core.ocs/src/Model/RemoteShare.php
  191. +1 −1 core/src/plugins/core.ocs/src/Model/SQLStore.php
  192. +8 −8 core/src/plugins/core.ocs/src/Server/Federated/Server.php
  193. +5 −5 core/src/plugins/core.uploader/class.CoreUploaderLoader.php
  194. +11 −11 core/src/plugins/cypher.encfs/class.EncfsMounter.php
  195. +11 −11 core/src/plugins/editor.audio/class.AudioPreviewer.php
  196. +7 −7 core/src/plugins/editor.browser/class.FileMimeSender.php
  197. +3 −2 core/src/plugins/editor.diaporama/PThumb.lib.php
  198. +13 −13 core/src/plugins/editor.diaporama/class.ImagePreviewer.php
  199. +33 −33 core/src/plugins/editor.eml/class.EmlParser.php
  200. +13 −13 core/src/plugins/editor.etherpad/class.EtherpadClient.php
  201. +17 −17 core/src/plugins/editor.imagick/class.IMagickPreviewer.php
  202. +18 −18 core/src/plugins/editor.pixlr/class.PixlrEditor.php
  203. +8 −8 core/src/plugins/editor.video/class.VideoReader.php
  204. +5 −4 core/src/plugins/editor.webodf/frame.php
  205. +14 −15 core/src/plugins/editor.zoho/class.ZohoEditor.php
  206. +14 −14 core/src/plugins/feed.sql/class.AJXP_SqlFeedStore.php
  207. +24 −24 core/src/plugins/gui.ajax/class.AJXP_ClientDriver.php
  208. +6 −6 core/src/plugins/gui.ios/class.IOSGuiPlugin.php
  209. +2 −2 core/src/plugins/gui.light/class.LightGuiPlugin.php
  210. +7 −7 core/src/plugins/gui.mobile/class.MobileGuiPlugin.php
  211. +12 −12 core/src/plugins/gui.user/class.UserGuiController.php
  212. +20 −20 core/src/plugins/index.elasticsearch/class.AjxpElasticSearch.php
  213. +44 −44 core/src/plugins/index.lucene/class.AjxpLuceneIndexer.php
  214. +27 −27 core/src/plugins/log.sql/class.sqlLogDriver.php
  215. +8 −8 core/src/plugins/log.text/class.textLogDriver.php
  216. +17 −17 core/src/plugins/meta.comments/class.CommentsMetaManager.php
  217. +9 −9 core/src/plugins/meta.exif/class.ExifMetaManager.php
  218. +11 −11 core/src/plugins/meta.filehasher/class.FileHasher.php
  219. +17 −17 core/src/plugins/meta.git/class.GitManager.php
  220. +2 −2 core/src/plugins/meta.monitor_fs/class.FSMonitoringManager.php
  221. +2 −2 core/src/plugins/meta.mount/class.FilesystemMounter.php
  222. +10 −10 core/src/plugins/meta.quota/class.QuotaComputer.php
  223. +8 −8 core/src/plugins/meta.simple_lock/class.SimpleLockManager.php
  224. +24 −24 core/src/plugins/meta.svn/class.SvnManager.php
  225. +1 −1 core/src/plugins/meta.svn/svn_lib.inc.php
  226. +30 −30 core/src/plugins/meta.syncable/class.ChangesTracker.php
  227. +15 −15 core/src/plugins/meta.user/class.UserMetaManager.php
  228. +9 −9 core/src/plugins/meta.watch/class.MetaWatchRegister.php
  229. +1 −1 core/src/plugins/metastore.s3/class.s3MetaStore.php
  230. +4 −4 core/src/plugins/metastore.serial/class.SerialMetaStore.php
  231. +1 −1 core/src/plugins/metastore.xattr/class.xAttrMetaStore.php
  232. +6 −6 core/src/plugins/mq.serial/class.AJXP_SerialMessageExchanger.php
  233. +8 −8 core/src/plugins/mq.sql/class.AJXP_SqlMessageExchanger.php
  234. +5 −5 core/src/plugins/shorten.bitly/class.BitlyShortener.php
  235. +8 −8 core/src/plugins/shorten.multi/class.multiShortener.php
  236. +5 −5 core/src/plugins/uploader.flex/class.FlexUploadProcessor.php
  237. +17 −17 core/src/plugins/uploader.html/class.SimpleUploadProcessor.php
  238. +22 −22 core/src/plugins/uploader.http/class.HttpDownloader.php
  239. +19 −19 core/src/plugins/uploader.jumploader/class.JumploaderProcessor.php
  240. +15 −15 core/src/plugins/uploader.plupload/class.PluploadProcessor.php
  241. +4 −4 core/src/publicLet.inc.php
  242. +15 −15 core/src/rest.php
  243. +5 −5 core/src/runTests.php
  244. +15 −8 core/src/worker.php
View
@@ -21,13 +21,13 @@
* Description : Command line access of the framework.
*/
use Pydio\Auth\Core\AJXP_Safe;
-use Pydio\Auth\Core\AuthService;
-use Pydio\Conf\Core\ConfService;
-use Pydio\Core\AJXP_Controller;
-use Pydio\Core\AJXP_Exception;
-use Pydio\Core\AJXP_XMLWriter;
-use Pydio\Core\Plugins\AJXP_PluginsService;
-use Pydio\Core\SystemTextEncoding;
+use Pydio\Core\Services\AuthService;
+use Pydio\Core\Services\ConfService;
+use Pydio\Core\Controller\Controller;
+use Pydio\Core\Exception\PydioException;
+use Pydio\Core\Controller\XMLWriter;
+use Pydio\Core\PluginFramework\PluginsService;
+use Pydio\Core\Utils\TextEncoder;
use Pydio\Log\Core\AJXP_Logger;
if (php_sapi_name() !== "cli") {
@@ -59,9 +59,9 @@
//echo("$key => $argument \n");
if (preg_match($regex, $argument, $matches)) {
if ($matches[1] == "-") {
- $optArgs[trim($matches[2])] = SystemTextEncoding::toUTF8(trim($matches[3]));
+ $optArgs[trim($matches[2])] = TextEncoder::toUTF8(trim($matches[3]));
} else {
- $options[trim($matches[2])] = SystemTextEncoding::toUTF8(trim($matches[3]));
+ $options[trim($matches[2])] = TextEncoder::toUTF8(trim($matches[3]));
}
}
}
@@ -154,7 +154,7 @@
}
try{
ConfService::switchRootDir($optRepoId, true);
- }catch(AJXP_Exception $e){}
+ }catch(PydioException $e){}
} else {
if ($optStatusFile) {
file_put_contents($optStatusFile, "ERROR:You must pass a -r argument specifying either a repository id or alias");
@@ -187,9 +187,9 @@
*/
}
if (isset($loggingResult) && $loggingResult != 1) {
- AJXP_XMLWriter::header();
- AJXP_XMLWriter::loggingResult($loggingResult, false, false, "");
- AJXP_XMLWriter::close();
+ XMLWriter::header();
+ XMLWriter::loggingResult($loggingResult, false, false, "");
+ XMLWriter::close();
if ($optStatusFile) {
file_put_contents($optStatusFile, "ERROR:No user logged");
}
@@ -205,48 +205,47 @@
$mess = ConfService::getMessages();
// THIS FIRST DRIVERS DO NOT NEED ID CHECK
-//$ajxpDriver = AJXP_PluginsService::findPlugin("gui", "ajax");
+//$ajxpDriver = PluginsService::findPlugin("gui", "ajax");
$authDriver = ConfService::getAuthDriverImpl();
// DRIVERS BELOW NEED IDENTIFICATION CHECK
if (!AuthService::usersEnabled() || ConfService::getCoreConf("ALLOW_GUEST_BROWSING", "auth") || AuthService::getLoggedUser()!=null) {
$confDriver = ConfService::getConfStorageImpl();
$loadRepo = ConfService::getRepository();
$Driver = ConfService::loadDriverForRepository($loadRepo);
}
-AJXP_PluginsService::getInstance()->initActivePlugins();
-require_once(AJXP_BIN_FOLDER."/class.AJXP_Controller.php");
-$xmlResult = AJXP_Controller::findActionAndApply($optAction, $optArgs, array());
+PluginsService::getInstance()->initActivePlugins();
+$xmlResult = Controller::findActionAndApply($optAction, $optArgs, array());
if ($xmlResult !== false && $xmlResult != "") {
- AJXP_XMLWriter::header();
+ XMLWriter::header();
print($xmlResult);
- AJXP_XMLWriter::close();
-} else if (isset($requireAuth) && AJXP_Controller::$lastActionNeedsAuth) {
- AJXP_XMLWriter::header();
- AJXP_XMLWriter::requireAuth();
- AJXP_XMLWriter::close();
+ XMLWriter::close();
+} else if (isset($requireAuth) && Controller::$lastActionNeedsAuth) {
+ XMLWriter::header();
+ XMLWriter::requireAuth();
+ XMLWriter::close();
}
//echo("NEXT REPO ".$nextRepositories." (".$options["r"].")\n");
//echo("NEXT USERS ".$nextUsers." ( ".$originalOptUser." )\n");
if (!empty($nextUsers) || !empty($nextRepositories) || !empty($optUserQueue) ) {
if (!empty($nextUsers)) {
sleep(1);
- $process = AJXP_Controller::applyActionInBackground($options["r"], $optAction, $optArgs, $nextUsers, $optStatusFile);
+ $process = Controller::applyActionInBackground($options["r"], $optAction, $optArgs, $nextUsers, $optStatusFile);
if ($process != null && is_a($process, "UnixProcess") && isSet($optStatusFile)) {
file_put_contents($optStatusFile, "RUNNING:".$process->getPid());
}
}
if (!empty($optUserQueue)) {
sleep(1);
//echo("Should go to next with $optUserQueue");
- $process = AJXP_Controller::applyActionInBackground($options["r"], $optAction, $optArgs, "queue:".$optUserQueue, $optStatusFile);
+ $process = Controller::applyActionInBackground($options["r"], $optAction, $optArgs, "queue:".$optUserQueue, $optStatusFile);
if ($process != null && is_a($process, "UnixProcess") && isSet($optStatusFile)) {
file_put_contents($optStatusFile, "RUNNING:".$process->getPid());
}
}
if (!empty($nextRepositories)) {
sleep(1);
- $process = AJXP_Controller::applyActionInBackground($nextRepositories, $optAction, $optArgs, $originalOptUser, $optStatusFile);
+ $process = Controller::applyActionInBackground($nextRepositories, $optAction, $optArgs, $originalOptUser, $optStatusFile);
if ($process != null && is_a($process, "UnixProcess") && isSet($optStatusFile)) {
file_put_contents($optStatusFile, "RUNNING:".$process->getPid());
}
@@ -110,12 +110,12 @@ function AjaXplorer_autoload($className)
if($className == "dibi"){
require_once(AJXP_BIN_FOLDER."/lib/dibi/dibi.php");
}
- $fileName = AJXP_BIN_FOLDER."/"."class.".$className.".php";
+ $fileName = AJXP_BIN_FOLDER."/pydio/Core/"."class.".$className.".php";
if (file_exists($fileName)) {
require_once($fileName);
return;
}
- $fileName = AJXP_BIN_FOLDER."/"."interface.".$className.".php";
+ $fileName = AJXP_BIN_FOLDER."/pydio/Core/"."interface.".$className.".php";
if (file_exists($fileName)) {
require_once($fileName);
return;
@@ -133,16 +133,16 @@ function AjaXplorer_autoload($className)
}
spl_autoload_register('AjaXplorer_autoload');
-include_once (AJXP_BIN_FOLDER."/compat.php");
+include_once(AJXP_INSTALL_PATH . "/core/compat.php");
-use Pydio\Core\AJXP_Utils;
+use Pydio\Core\Utils\Utils;
-AJXP_Utils::safeIniSet("session.cookie_httponly", 1);
+Utils::safeIniSet("session.cookie_httponly", 1);
if (is_file(AJXP_CONF_PATH."/bootstrap_conf.php")) {
include(AJXP_CONF_PATH."/bootstrap_conf.php");
if (isSet($AJXP_INISET)) {
- foreach($AJXP_INISET as $key => $value) AJXP_Utils::safeIniSet($key, $value);
+ foreach($AJXP_INISET as $key => $value) Utils::safeIniSet($key, $value);
}
if (defined('AJXP_LOCALE')) {
setlocale(LC_CTYPE, AJXP_LOCALE);
@@ -1,105 +0,0 @@
-<?php
-/*
- * Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
- * This file is part of Pydio.
- *
- * Pydio is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Pydio is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Pydio. If not, see <http://www.gnu.org/licenses/>.
- *
- * The latest code can be found at <http://pyd.io/>.
- *
- * This is the main configuration file for configuring the basic plugins the application
- * needs to run properly : an Authentication plugin, a Configuration plugin, and a Logger plugin.
- */
-
-defined('AJXP_EXEC') or die( 'Access not allowed');
-/********************************************
- * CUSTOM VARIABLES HOOK
- ********************************************/
-/**
- * This is a sample "hard" hook, directly included. See directly the PluginSkeleton class
- * for more explanation.
- */
-//require_once AJXP_INSTALL_PATH."/plugins/action.skeleton/class.PluginSkeleton.php";
-//AJXP_Controller::registerIncludeHook("vars.filter", array("PluginSkeleton", "filterVars"));
-
-/*********************************************************
- * PLUGINS DEFINITIONS
- * Drivers will define how the application will work. For
- * each type of operation, there are multiple implementation
- * possible. Check the content of the plugins folder.
- * CONF = users and repositories definition,
- * AUTH = users authentication mechanism,
- * LOG = logs of the application.
- *
- * This template shows how to configure the auth.remote plugin
- * for joomla or Drupal
- *
-*********************************************************/
-$PLUGINS = array(
- "CONF_DRIVER" => array(
- "NAME" => "serial",
- "OPTIONS" => array(
- "REPOSITORIES_FILEPATH" => "AJXP_DATA_PATH/plugins/conf.serial/repo.ser",
- "ROLES_FILEPATH" => "AJXP_DATA_PATH/plugins/auth.serial/roles.ser",
- "USERS_DIRPATH" => "AJXP_DATA_PATH/plugins/auth.serial",
- "FAST_CHECKS" => false,
- "CUSTOM_DATA" => array(
- "email" => "Email",
- "country" => "Country",
- "USER_QUOTA"=> "Quota"
- )
- )
- ),
- "AUTH_DRIVER" => array(
- "NAME" => "remote",
- "OPTIONS" => array(
- "SLAVE_MODE" => true,
- "USERS_FILEPATH" => "AJXP_DATA_PATH/plugins/auth.serial/users.ser",
- "MASTER_AUTH_FUNCTION" => "joomla_remote_auth",
- "MASTER_HOST" => "localhost",
- "MASTER_URI" => "/joomla/",
- "LOGIN_URL" => "/joomla/", // The URL to redirect (or call) upon login (typically if one of your user type: http://yourserver/path/to/ajxp, he will get redirected to this url to login into your frontend
- "LOGOUT_URL" => "/joomla/", // The URL to redirect upon login out (see above)
- "SECRET" => "myprivatesecret",// the same as the one you put in the WP plugin option.
- "TRANSMIT_CLEAR_PASS" => true // Don't touch this. It's unsafe (and useless here) to transmit clear password.
- )
- ),
- /*
- // Same for Drupal 7.X
- "AUTH_DRIVER" => array(
- "NAME" => "remote",
- "OPTIONS" => array(
- "SLAVE_MODE" => true,
- "USERS_FILEPATH" => "AJXP_INSTALL_PATH/plugins/auth.serial/users.ser",
- "LOGIN_URL" => "/drupal/",
- "LOGOUT_URL" => "/drupal/?q=user/logout",
- "MASTER_AUTH_FUNCTION" => "drupal_remote_auth",
- "MASTER_HOST" => "192.168.0.10",
- "MASTER_URI" => "/drupal/",
- "MASTER_AUTH_FORM_ID" => "user-login-form",
- "SECRET" => "my_own_private_Drupal_key",
- "TRANSMIT_CLEAR_PASS" => true
- )
- ),
- */
- "LOG_DRIVER" => array(
- "NAME" => "text",
- "OPTIONS" => array(
- "LOG_PATH" => (defined("AJXP_FORCE_LOGPATH")?AJXP_FORCE_LOGPATH:"AJXP_INSTALL_PATH/data/logs/"),
- "LOG_FILE_NAME" => 'log_' . date('m-d-y') . '.txt',
- "LOG_CHMOD" => 0770
- )
- ),
-
-);
Oops, something went wrong.

0 comments on commit c4c1026

Please sign in to comment.