diff options
Diffstat (limited to 'apps/files_external')
70 files changed, 117 insertions, 158 deletions
diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php index e7fa44b34d1..7e0fafdad83 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/Prods.inc.php @@ -1,4 +1,3 @@ <?php require_once("autoload.inc.php"); require_once("ProdsConfig.inc.php"); -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php index 478c90d631f..1089932a3e2 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsConfig.inc.php @@ -15,5 +15,3 @@ if (file_exists(__DIR__ . "/prods.ini")) { else { $GLOBALS['PRODS_CONFIG'] = array(); } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php index be7c6c56788..fdf100b77a4 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsPath.class.php @@ -279,5 +279,3 @@ abstract class ProdsPath } } - -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php index 62469725970..5e8dc92d594 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsQuery.class.php @@ -103,5 +103,3 @@ class ProdsQuery } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php index 42308d9cc35..d14d87ad1aa 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsRule.class.php @@ -58,5 +58,3 @@ class ProdsRule return $result; } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php index 27b927bb033..67ef096c5c5 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/ProdsStreamer.class.php @@ -432,5 +432,3 @@ stream_wrapper_register('rods', 'ProdsStreamer') or die ('Failed to register protocol:rods'); stream_wrapper_register('rods+ticket', 'ProdsStreamer') or die ('Failed to register protocol:rods'); -?> - diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php index f47f85bc238..ba4c5ad96b0 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSAccount.class.php @@ -199,5 +199,3 @@ class RODSAccount return $dir->toURI(); } } - -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php index 0498f42cfaa..c10f880a5cc 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConn.class.php @@ -1611,5 +1611,3 @@ class RODSConn return $results; } } - -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php index 830e01bde84..b3e8155da4d 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSConnManager.class.php @@ -77,5 +77,3 @@ class RODSConnManager } } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php index 52eb95bbfb5..97116a102c1 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSException.class.php @@ -180,5 +180,3 @@ class RODSException extends Exception } } - -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php index 848f29e85e9..4bc10cc549f 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueConds.class.php @@ -110,5 +110,3 @@ class RODSGenQueConds return $this->cond; } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php index 41be1069afd..899b4f0e3b4 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueResults.class.php @@ -95,5 +95,3 @@ class RODSGenQueResults return $this->numrow; } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php index 10a32f6614f..aa391613d07 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSGenQueSelFlds.class.php @@ -156,5 +156,3 @@ class RODSGenQueSelFlds } } - -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php index 31b720cf19c..f347f7c988a 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSKeyValPair.class.php @@ -46,5 +46,3 @@ class RODSKeyValPair return $new_keyval; } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php index ca3e8bc23a6..243903a42df 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSMessage.class.php @@ -181,5 +181,3 @@ class RODSMessage return $rods_msg->pack(); } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php index 95807d12ea8..1d367e900bc 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RODSObjIOOpr.inc.php @@ -17,4 +17,3 @@ define ("RSYNC_OPR", 14); define ("PHYMV_OPR", 15); define ("PHYMV_SRC", 16); define ("PHYMV_DEST", 17); -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php index c4e2c031174..258dfcab39d 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsAPINum.inc.php @@ -214,4 +214,3 @@ $GLOBALS['PRODS_API_NUMS_REV'] = array( '1100' => 'SSL_START_AN', '1101' => 'SSL_END_AN', ); -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php index 1d51f619197..ecc2f5c2593 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsConst.inc.php @@ -4,5 +4,3 @@ // are doing! define ("ORDER_BY", 0x400); define ("ORDER_BY_DESC", 0x800); - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php index 7c4bb170d4a..177ca5b1260 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsErrorTable.inc.php @@ -584,4 +584,3 @@ $GLOBALS['PRODS_ERR_CODES_REV'] = array( '-993000' => 'PAM_AUTH_PASSWORD_FAILED', '-994000' => 'PAM_AUTH_PASSWORD_INVALID_TTL', ); -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php index ff830c6d6aa..55ad02e3b82 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryKeyWd.inc.php @@ -222,4 +222,3 @@ $GLOBALS['PRODS_GENQUE_KEYWD_REV'] = array( "lastExeTime" => 'RULE_LAST_EXE_TIME_KW', "exeStatus" => 'RULE_EXE_STATUS_KW', ); -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php index 82de94095b2..a65823ec877 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/RodsGenQueryNum.inc.php @@ -232,4 +232,3 @@ $GLOBALS['PRODS_GENQUE_NUMS_REV'] = array( '1105' => 'COL_TOKEN_VALUE3', '1106' => 'COL_TOKEN_COMMENT', ); -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php index 89040882d20..e5cff1f60e3 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RODSPacket.class.php @@ -246,5 +246,3 @@ class RODSPacket } */ } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php index 8cabcd0ae42..a7598bb7e62 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_BinBytesBuf.class.php @@ -10,5 +10,3 @@ class RP_BinBytesBuf extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php index b7ad6fd0cad..05c51cf56c0 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollInp.class.php @@ -15,5 +15,3 @@ class RP_CollInp extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php index 939d2e37596..a9140050bc7 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_CollOprStat.class.php @@ -13,5 +13,3 @@ class RP_CollOprStat extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php index c16b3628f5e..481ff34a22a 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjCopyInp.class.php @@ -15,5 +15,3 @@ class RP_DataObjCopyInp extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php index f7a8f939b82..f6200d1761c 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_DataObjInp.class.php @@ -18,5 +18,3 @@ class RP_DataObjInp extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php index 55dcb02383d..a7559e3c256 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecCmdOut.class.php @@ -52,5 +52,3 @@ class RP_ExecCmdOut extends RODSPacket } } } - -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php index 88a62fc2b0c..2eb5dbd6ff9 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ExecMyRuleInp.class.php @@ -18,5 +18,3 @@ class RP_ExecMyRuleInp extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php index 2e1e29a2bfe..cf4bf340606 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryInp.class.php @@ -21,5 +21,3 @@ class RP_GenQueryInp extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php index e9f31dd5368..afec88c45b1 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_GenQueryOut.class.php @@ -18,5 +18,3 @@ class RP_GenQueryOut extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php index ac56bc93df8..e8af5c9fc5c 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxIvalPair.class.php @@ -23,5 +23,3 @@ class RP_InxIvalPair extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php index 787d27fd103..4a08780f4a3 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_InxValPair.class.php @@ -40,5 +40,3 @@ class RP_InxValPair extends RODSPacket } } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php index 6d8dd12ff12..905d88bc8a2 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_KeyValPair.class.php @@ -43,5 +43,3 @@ class RP_KeyValPair extends RODSPacket } } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php index 65ee3580e97..4f54c9c4e76 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MiscSvrInfo.class.php @@ -13,5 +13,3 @@ class RP_MiscSvrInfo extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php index b67b7083d44..467541734df 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_ModAVUMetadataInp.class.php @@ -14,5 +14,3 @@ class RP_ModAVUMetadataInp extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php index abf9bc471bb..fa5d4fcc3dc 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParam.class.php @@ -41,5 +41,3 @@ class RP_MsParam extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php index b747c098dd2..b664abe62bc 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsParamArray.class.php @@ -17,5 +17,3 @@ class RP_MsParamArray extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php index 0249da9a05d..f1b03f779d1 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_MsgHeader.class.php @@ -12,6 +12,3 @@ class RP_MsgHeader extends RODSPacket } } - -?> -
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php index 28602f3150f..2ac70dc22cc 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RHostAddr.class.php @@ -11,5 +11,3 @@ class RP_RHostAddr extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php index 290a4c9a5b0..96f427a2de5 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_RodsObjStat.class.php @@ -16,5 +16,3 @@ class RP_RodsObjStat extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php index 3f5a91a35d0..af7739988d4 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_STR.class.php @@ -10,5 +10,3 @@ class RP_STR extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php index 1950f096f13..e6ee1c3adbb 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_SqlResult.class.php @@ -11,5 +11,3 @@ class RP_SqlResult extends RODSPacket } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php index a411bd7425b..700fbd34428 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_StartupPack.class.php @@ -14,5 +14,3 @@ class RP_StartupPack extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php index bb591f01343..5c962649df0 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_TransStat.class.php @@ -12,5 +12,3 @@ class RP_TransStat extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php index a08cb6cc24c..9fa9b7d1c35 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_Version.class.php @@ -12,5 +12,3 @@ class RP_Version extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php index 9dc87140635..a702650c0eb 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authRequestOut.class.php @@ -10,5 +10,3 @@ class RP_authRequestOut extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php index 23d754df0ac..3f9cbc618f7 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_authResponseInp.class.php @@ -10,5 +10,3 @@ class RP_authResponseInp extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php index d16e1b3f3a4..d37afe23c95 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjCloseInp.class.php @@ -12,5 +12,3 @@ class RP_dataObjCloseInp extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php index 29bd1b68e35..31b12354714 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjReadInp.class.php @@ -12,5 +12,3 @@ class RP_dataObjReadInp extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php index 5327d7a8932..175b7e83402 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_dataObjWriteInp.class.php @@ -12,5 +12,3 @@ class RP_dataObjWriteInp extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php index e28a7b3b498..83b77f4704f 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekInp.class.php @@ -12,5 +12,3 @@ class RP_fileLseekInp extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php index cf01741bea6..45811e7ca68 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_fileLseekOut.class.php @@ -11,5 +11,3 @@ class RP_fileLseekOut extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php index ba073e97939..29c1001df68 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_getTempPasswordOut.class.php @@ -10,5 +10,3 @@ class RP_getTempPasswordOut extends RODSPacket } } - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php index 0bbc2334a82..e42ac918d45 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestInp.class.php @@ -10,4 +10,3 @@ class RP_pamAuthRequestInp extends RODSPacket } } -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php index 01959954c97..b3ec1306556 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_pamAuthRequestOut.class.php @@ -10,4 +10,3 @@ class RP_pamAuthRequestOut extends RODSPacket } } -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php index 530f3048604..26470378a7d 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslEndInp.class.php @@ -10,4 +10,3 @@ class RP_sslEndInp extends RODSPacket } } -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php index 03c8365898e..a23756e7860 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/packet/RP_sslStartInp.class.php @@ -10,4 +10,3 @@ class RP_sslStartInp extends RODSPacket } } -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php index 382a85c051e..98c1f6cabdf 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsAPINum.php @@ -66,5 +66,3 @@ $outputstr = $outputstr . ");\n"; $outputstr = $outputstr . "?>\n"; file_put_contents($prods_api_num_file, $outputstr); - -?> diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php index d5c43773845..142b4af5702 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsErrorCodes.php @@ -71,5 +71,3 @@ $outputstr = $outputstr . ");\n"; $outputstr = $outputstr . "?>\n"; file_put_contents($prods_error_table_file, $outputstr); - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php index 4372a849aac..5a5968d25af 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryKeyWd.php @@ -69,5 +69,3 @@ $outputstr = $outputstr . ");\n"; $outputstr = $outputstr . "?>\n"; file_put_contents($prods_genque_keywd_file, $outputstr); - -?>
\ No newline at end of file diff --git a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php index 03fa051f092..0be297826e6 100644 --- a/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php +++ b/apps/files_external/3rdparty/irodsphp/prods/src/setRodsGenQueryNum.php @@ -59,5 +59,3 @@ $outputstr = $outputstr . ");\n"; $outputstr = $outputstr . "?>\n"; file_put_contents($prods_genque_num_file, $outputstr); - -?>
\ No newline at end of file diff --git a/apps/files_external/l10n/de_CH.php b/apps/files_external/l10n/de_CH.php new file mode 100644 index 00000000000..85e2f2d91fd --- /dev/null +++ b/apps/files_external/l10n/de_CH.php @@ -0,0 +1,28 @@ +<?php +$TRANSLATIONS = array( +"Access granted" => "Zugriff gestattet", +"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox", +"Grant access" => "Zugriff gestatten", +"Please provide a valid Dropbox app key and secret." => "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.", +"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive", +"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Warnung:</b> «smbclient» ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren.", +"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Warnung::</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator.", +"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Achtung:</b> Die Curl-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren.", +"External Storage" => "Externer Speicher", +"Folder name" => "Ordnername", +"External storage" => "Externer Speicher", +"Configuration" => "Konfiguration", +"Options" => "Optionen", +"Applicable" => "Zutreffend", +"Add storage" => "Speicher hinzufügen", +"None set" => "Nicht definiert", +"All Users" => "Alle Benutzer", +"Groups" => "Gruppen", +"Users" => "Benutzer", +"Delete" => "Löschen", +"Enable User External Storage" => "Externen Speicher für Benutzer aktivieren", +"Allow users to mount their own external storage" => "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden", +"SSL root certificates" => "SSL-Root-Zertifikate", +"Import Root Certificate" => "Root-Zertifikate importieren" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_external/l10n/en_GB.php b/apps/files_external/l10n/en_GB.php new file mode 100644 index 00000000000..8adca794dda --- /dev/null +++ b/apps/files_external/l10n/en_GB.php @@ -0,0 +1,28 @@ +<?php +$TRANSLATIONS = array( +"Access granted" => "Access granted", +"Error configuring Dropbox storage" => "Error configuring Dropbox storage", +"Grant access" => "Grant access", +"Please provide a valid Dropbox app key and secret." => "Please provide a valid Dropbox app key and secret.", +"Error configuring Google Drive storage" => "Error configuring Google Drive storage", +"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.", +"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.", +"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it.", +"External Storage" => "External Storage", +"Folder name" => "Folder name", +"External storage" => "External storage", +"Configuration" => "Configuration", +"Options" => "Options", +"Applicable" => "Applicable", +"Add storage" => "Add storage", +"None set" => "None set", +"All Users" => "All Users", +"Groups" => "Groups", +"Users" => "Users", +"Delete" => "Delete", +"Enable User External Storage" => "Enable User External Storage", +"Allow users to mount their own external storage" => "Allow users to mount their own external storage", +"SSL root certificates" => "SSL root certificates", +"Import Root Certificate" => "Import Root Certificate" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_external/l10n/pa.php b/apps/files_external/l10n/pa.php new file mode 100644 index 00000000000..d633784f5ce --- /dev/null +++ b/apps/files_external/l10n/pa.php @@ -0,0 +1,6 @@ +<?php +$TRANSLATIONS = array( +"Groups" => "ਗਰੁੱਪ", +"Delete" => "ਹਟਾਓ" +); +$PLURAL_FORMS = "nplurals=2; plural=(n != 1);"; diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 2d7bcd4ac37..c08a266b48c 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -183,17 +183,20 @@ class AmazonS3 extends \OC\Files\Storage\Common { } $dh = $this->opendir($path); - while (($file = readdir($dh)) !== false) { - if ($file === '.' || $file === '..') { - continue; - } - if ($this->is_dir($path . '/' . $file)) { - $this->rmdir($path . '/' . $file); - } else { - $this->unlink($path . '/' . $file); + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if ($file === '.' || $file === '..') { + continue; + } + + if ($this->is_dir($path . '/' . $file)) { + $this->rmdir($path . '/' . $file); + } else { + $this->unlink($path . '/' . $file); + } } - } + } try { $result = $this->connection->deleteObject(array( @@ -464,15 +467,17 @@ class AmazonS3 extends \OC\Files\Storage\Common { } $dh = $this->opendir($path1); - while (($file = readdir($dh)) !== false) { - if ($file === '.' || $file === '..') { - continue; + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if ($file === '.' || $file === '..') { + continue; + } + + $source = $path1 . '/' . $file; + $target = $path2 . '/' . $file; + $this->copy($source, $target); } - - $source = $path1 . '/' . $file; - $target = $path2 . '/' . $file; - $this->copy($source, $target); - } + } } return true; diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index 1935740cd2e..659959e662e 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -378,7 +378,7 @@ class OC_Mount_Config { } $result = array(); $handle = opendir($path); - if ( ! $handle) { + if(!is_resource($handle)) { return array(); } while (false !== ($file = readdir($handle))) { diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php index 215bdcda6c2..b63b5885de1 100644 --- a/apps/files_external/lib/google.php +++ b/apps/files_external/lib/google.php @@ -206,14 +206,16 @@ class Google extends \OC\Files\Storage\Common { public function rmdir($path) { if (trim($path, '/') === '') { $dir = $this->opendir($path); - while (($file = readdir($dh)) !== false) { - if (!\OC\Files\Filesystem::isIgnoredDir($file)) { - if (!$this->unlink($path.'/'.$file)) { - return false; + if(is_resource($dir)) { + while (($file = readdir($dir)) !== false) { + if (!\OC\Files\Filesystem::isIgnoredDir($file)) { + if (!$this->unlink($path.'/'.$file)) { + return false; + } } } + closedir($dir); } - closedir($dir); $this->driveFiles = array(); return true; } else { diff --git a/apps/files_external/lib/irods.php b/apps/files_external/lib/irods.php index 7ec3b3a0cfc..6d4f66e856e 100644 --- a/apps/files_external/lib/irods.php +++ b/apps/files_external/lib/irods.php @@ -27,12 +27,12 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{ private $auth_mode; public function __construct($params) { - if (isset($params['host']) && isset($params['user']) && isset($params['password'])) { + if (isset($params['host'])) { $this->host = $params['host']; - $this->port = $params['port']; - $this->user = $params['user']; - $this->password = $params['password']; - $this->use_logon_credentials = $params['use_logon_credentials']; + $this->port = isset($params['port']) ? $params['port'] : 1247; + $this->user = isset($params['user']) ? $params['user'] : ''; + $this->password = isset($params['password']) ? $params['password'] : ''; + $this->use_logon_credentials = ($params['use_logon_credentials'] === 'true'); $this->zone = $params['zone']; $this->auth_mode = isset($params['auth_mode']) ? $params['auth_mode'] : ''; @@ -42,10 +42,11 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{ } // take user and password from the session - if ($this->use_logon_credentials && isset($_SESSION['irods-credentials']) ) + if ($this->use_logon_credentials && \OC::$session->exists('irods-credentials')) { - $this->user = $_SESSION['irods-credentials']['uid']; - $this->password = $_SESSION['irods-credentials']['password']; + $params = \OC::$session->get('irods-credentials'); + $this->user = $params['uid']; + $this->password = $params['password']; } //create the root folder if necessary @@ -55,11 +56,11 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{ } else { throw new \Exception(); } - + } public static function login( $params ) { - $_SESSION['irods-credentials'] = $params; + \OC::$session->set('irods-credentials', $params); } public function getId(){ @@ -137,11 +138,13 @@ class iRODS extends \OC\Files\Storage\StreamWrapper{ private function collectionMTime($path) { $dh = $this->opendir($path); $lastCTime = $this->filemtime($path); - while (($file = readdir($dh)) !== false) { - if ($file != '.' and $file != '..') { - $time = $this->filemtime($file); - if ($time > $lastCTime) { - $lastCTime = $time; + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if ($file != '.' and $file != '..') { + $time = $this->filemtime($file); + if ($time > $lastCTime) { + $lastCTime = $time; + } } } } diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php index 8e7a28fba1a..ecd4dae0484 100644 --- a/apps/files_external/lib/smb.php +++ b/apps/files_external/lib/smb.php @@ -99,11 +99,13 @@ class SMB extends \OC\Files\Storage\StreamWrapper{ private function shareMTime() { $dh=$this->opendir(''); $lastCtime=0; - while (($file = readdir($dh)) !== false) { - if ($file!='.' and $file!='..') { - $ctime=$this->filemtime($file); - if ($ctime>$lastCtime) { - $lastCtime=$ctime; + if(is_resource($dh)) { + while (($file = readdir($dh)) !== false) { + if ($file!='.' and $file!='..') { + $ctime=$this->filemtime($file); + if ($ctime>$lastCtime) { + $lastCtime=$ctime; + } } } } |