Permalink
Browse files

Move non-composer-managed libs to core/src/lib. Most should be remove…

…d at one point.
  • Loading branch information...
1 parent 3cd8a1b commit ac700e7a9e4e91687177f251b250482846cfe895 @cdujeu cdujeu committed May 7, 2016
Showing with 7 additions and 9 deletions.
  1. +1 −1 core/src/conf/bootstrap_context.php
  2. +2 −2 core/src/core/src/class.AJXP_JSPacker.php
  3. +1 −1 core/src/core/src/class.CaptchaProvider.php
  4. +0 −2 core/src/core/src/dibi.compact.php
  5. 0 core/src/core/src/{ → lib}/dibi/dibi.php
  6. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiFirebirdDriver.php
  7. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiMsSql2005Driver.php
  8. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiMsSql2005Reflector.php
  9. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiMsSqlDriver.php
  10. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiMsSqlReflector.php
  11. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiMySqlDriver.php
  12. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiMySqlReflector.php
  13. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiMySqliDriver.php
  14. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiOdbcDriver.php
  15. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiOracleDriver.php
  16. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiPdoDriver.php
  17. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiPostgreDriver.php
  18. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiSqlite3Driver.php
  19. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiSqliteDriver.php
  20. 0 core/src/core/src/{ → lib}/dibi/drivers/DibiSqliteReflector.php
  21. 0 core/src/core/src/{ → lib}/dibi/libs/Dibi.php
  22. 0 core/src/core/src/{ → lib}/dibi/libs/DibiConnection.php
  23. 0 core/src/core/src/{ → lib}/dibi/libs/DibiDataSource.php
  24. 0 core/src/core/src/{ → lib}/dibi/libs/DibiDatabaseInfo.php
  25. 0 core/src/core/src/{ → lib}/dibi/libs/DibiDateTime.php
  26. 0 core/src/core/src/{ → lib}/dibi/libs/DibiEvent.php
  27. 0 core/src/core/src/{ → lib}/dibi/libs/DibiException.php
  28. 0 core/src/core/src/{ → lib}/dibi/libs/DibiFileLogger.php
  29. 0 core/src/core/src/{ → lib}/dibi/libs/DibiFirePhpLogger.php
  30. 0 core/src/core/src/{ → lib}/dibi/libs/DibiFluent.php
  31. 0 core/src/core/src/{ → lib}/dibi/libs/DibiHashMap.php
  32. 0 core/src/core/src/{ → lib}/dibi/libs/DibiLiteral.php
  33. 0 core/src/core/src/{ → lib}/dibi/libs/DibiObject.php
  34. 0 core/src/core/src/{ → lib}/dibi/libs/DibiResult.php
  35. 0 core/src/core/src/{ → lib}/dibi/libs/DibiResultIterator.php
  36. 0 core/src/core/src/{ → lib}/dibi/libs/DibiRow.php
  37. 0 core/src/core/src/{ → lib}/dibi/libs/DibiTranslator.php
  38. 0 core/src/core/src/{ → lib}/dibi/libs/interfaces.php
  39. 0 core/src/core/src/{ → lib}/http_class/LICENSE.txt
  40. 0 core/src/core/src/{ → lib}/http_class/http_class.php
  41. 0 core/src/core/src/{ → lib}/packer/class.JavaScriptPacker.php
  42. 0 core/src/core/src/{ → lib}/packer/index.html
  43. BIN core/src/core/src/{ → lib}/securimage/AHGBold.ttf
  44. 0 core/src/core/src/{ → lib}/securimage/LICENSE.txt
  45. 0 core/src/core/src/{ → lib}/securimage/README.FONT.txt
  46. 0 core/src/core/src/{ → lib}/securimage/README.txt
  47. BIN core/src/core/src/{ → lib}/securimage/gdfonts/automatic.gdf
  48. BIN core/src/core/src/{ → lib}/securimage/images/refresh.gif
  49. 0 core/src/core/src/{ → lib}/securimage/securimage.php
  50. 0 core/src/core/src/{ → lib}/securimage/words/words.txt
  51. +1 −1 core/src/plugins/editor.pixlr/class.PixlrEditor.php
  52. +1 −1 core/src/plugins/editor.zoho/class.ZohoEditor.php
  53. +1 −1 core/src/plugins/uploader.http/class.HttpDownloader.php
@@ -108,7 +108,7 @@ function AjaXplorer_autoload($className)
$className = array_pop(explode("\\", $className));
if($className == "dibi"){
- require_once(AJXP_BIN_FOLDER."/dibi/dibi.php");
+ require_once(AJXP_BIN_FOLDER."/lib/dibi/dibi.php");
}
$fileName = AJXP_BIN_FOLDER."/"."class.".$className.".php";
if (file_exists($fileName)) {
@@ -91,7 +91,7 @@ public function concatListAndPack($src, $out, $mode)
}
// Pack and write to file
- require_once("packer/class.JavaScriptPacker.php");
+ require_once(AJXP_BIN_FOLDER."/lib/packer/class.JavaScriptPacker.php");
$packer = new \JavaScriptPacker($jscode, $mode , true, false);
$packed = $packer->pack();
if ($mode == "None") { // css case, hack for I.E.
@@ -107,7 +107,7 @@ public function concatListAndPack($src, $out, $mode)
public function compactEach($list, $mode){
$lines = file($list);
- require_once("packer/class.JavaScriptPacker.php");
+ require_once(AJXP_BIN_FOLDER."/lib/packer/class.JavaScriptPacker.php");
$fullcode = '';
foreach($lines as $line){
$in = AJXP_INSTALL_PATH."/".CLIENT_RESOURCES_FOLDER."/".rtrim($line,"\n\r");
@@ -22,7 +22,7 @@
defined('AJXP_EXEC') or die( 'Access not allowed');
-include_once(AJXP_BIN_FOLDER."/securimage/securimage.php");
+include_once(AJXP_BIN_FOLDER."/lib/securimage/securimage.php");
/**
* Encapsulation of the securimage external library, to generate a Captcha Image on brute force login attempt.
@@ -1,2 +0,0 @@
-<?php
-require_once("dibi/dibi.php");
@@ -86,7 +86,7 @@ public function switchAction($action, $httpVars, $filesVars)
"locktype" => "source"
);
- require_once(AJXP_BIN_FOLDER."/http_class/http_class.php");
+ require_once(AJXP_BIN_FOLDER."/lib/http_class/http_class.php");
$arguments = array();
$httpClient = new http_class();
$httpClient->request_method = "POST";
@@ -121,7 +121,7 @@ public function switchAction($action, $httpVars, $filesVars)
$presExt = explode(",", "ppt,pptx,pps,odp,sxi");
$docExt = explode(",", "doc,docx,rtf,odt,sxw");
- require_once(AJXP_BIN_FOLDER."/http_class/http_class.php");
+ require_once(AJXP_BIN_FOLDER."/lib/http_class/http_class.php");
// Backward compat
if(strpos($httpVars["file"], "base64encoded:") !== 0){
@@ -81,7 +81,7 @@ public function switchAction($action, $httpVars, $fileVars)
exit();
}
- require_once(AJXP_BIN_FOLDER."/http_class/http_class.php");
+ require_once(AJXP_BIN_FOLDER."/lib/http_class/http_class.php");
session_write_close();
$httpClient = new http_class();

0 comments on commit ac700e7

Please sign in to comment.