Skip to content

Commit e2bd7b3

Browse files
abantecartabantecart
committed
Revert "abc cloud related fixes."
This reverts commit 0c74685.
1 parent a94cdbf commit e2bd7b3

File tree

3,767 files changed

+460884
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,767 files changed

+460884
-16
lines changed

‎public_html/core/helper/system_check.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -193,34 +193,34 @@ function check_file_permissions($registry)
193193
];
194194
}
195195

196-
if (!is_writable(DIR_ADMIN_SYSTEM)) {
196+
if (!is_writable(DIR_ROOT.'/admin/system')) {
197197
$ret_array[] = [
198198
'title' => 'Incorrect directory permission',
199-
'body' => DIR_ADMIN_SYSTEM.' directory needs to be set to full permissions(777)! AbanteCart backups and upgrade will not work.',
199+
'body' => DIR_ROOT.'/admin/system'.' directory needs to be set to full permissions(777)! AbanteCart backups and upgrade will not work.',
200200
'type' => 'W',
201201
];
202202
}
203203

204-
if (is_dir(DIR_ADMIN_SYSTEM.'backup') && !is_writable(DIR_ADMIN_SYSTEM.'backup')) {
204+
if (is_dir(DIR_ROOT.'/admin/system/backup') && !is_writable(DIR_ROOT.'/admin/system/backup')) {
205205
$ret_array[] = [
206206
'title' => 'Incorrect backup directory permission',
207-
'body' => DIR_ADMIN_SYSTEM.'backup'.' directory needs to be set to full permissions(777)! AbanteCart backups and upgrade will not work.',
207+
'body' => DIR_ROOT.'/admin/system/backup'.' directory needs to be set to full permissions(777)! AbanteCart backups and upgrade will not work.',
208208
'type' => 'W',
209209
];
210210
}
211211

212-
if (is_dir(DIR_ADMIN_SYSTEM.'temp') && !is_writable(DIR_ADMIN_SYSTEM.'temp')) {
212+
if (is_dir(DIR_ROOT.'/admin/system/temp') && !is_writable(DIR_ROOT.'/admin/system/temp')) {
213213
$ret_array[] = [
214214
'title' => 'Incorrect temp directory permission',
215-
'body' => DIR_ADMIN_SYSTEM.'temp'.' directory needs to be set to full permissions(777)!',
215+
'body' => DIR_ROOT.'/admin/system/temp'.' directory needs to be set to full permissions(777)!',
216216
'type' => 'W',
217217
];
218218
}
219219

220-
if (is_dir(DIR_ADMIN_SYSTEM.'uploads') && !is_writable(DIR_ADMIN_SYSTEM.'uploads')) {
220+
if (is_dir(DIR_ROOT.'/admin/system/uploads') && !is_writable(DIR_ROOT.'/admin/system/uploads')) {
221221
$ret_array[] = [
222222
'title' => 'Incorrect "uploads" directory permission',
223-
'body' => DIR_ADMIN_SYSTEM.'uploads'.' directory needs to be set to full permissions(777)! Probably AbanteCart file uploads will not work.',
223+
'body' => DIR_ROOT.'/admin/system/uploads'.' directory needs to be set to full permissions(777)! Probably AbanteCart file uploads will not work.',
224224
'type' => 'W',
225225
];
226226
}

‎public_html/core/init.php‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,20 +117,17 @@
117117
) {
118118
define('IS_ADMIN', true);
119119
define('DIR_APP_SECTION', DIR_ROOT.'/admin/');
120-
define('DIR_APP_SYSTEM', DATA_DIR.'/admin/system/');
121120
define('DIR_LANGUAGE', DIR_ROOT.'/admin/language/');
122121
define('DIR_TEMPLATE', DATA_DIR.'/admin/view/');
123122
define('DIR_STOREFRONT', DIR_ROOT.'/storefront/');
124-
define('DIR_ADMIN_SYSTEM', DATA_DIR.'/admin/system/');
125-
define('DIR_BACKUP', DIR_ADMIN_SYSTEM.'backup/');
126-
define('DIR_DATA', DIR_ADMIN_SYSTEM.'data/');
123+
define('DIR_BACKUP', DATA_DIR.'/admin/system/backup/');
124+
define('DIR_DATA', DATA_DIR.'/admin/system/data/');
127125
//generate unique session name.
128126
//NOTE: This is a session name not to confuse with actual session id. Candidate to renaming
129127
define('SESSION_ID', defined('UNIQUE_ID') ? 'AC_CP_'.strtoupper(substr(UNIQUE_ID, 0, 10)) : 'AC_CP_PHPSESSID');
130128
} else {
131129
define('IS_ADMIN', false);
132130
define('DIR_APP_SECTION', DIR_ROOT.'/storefront/');
133-
define('DIR_APP_SYSTEM', DATA_DIR.'/system/');
134131
define('DIR_LANGUAGE', DIR_ROOT.'/storefront/language/');
135132
define('DIR_TEMPLATE', DATA_DIR.'/storefront/view/');
136133
define('SESSION_ID', defined('UNIQUE_ID') ? 'AC_SF_'.strtoupper(substr(UNIQUE_ID, 0, 10)) : 'AC_SF_PHPSESSID');
@@ -217,7 +214,7 @@ function clean($data)
217214

218215
// relative paths for extensions
219216
define('DIR_EXTENSIONS', 'extensions/');
220-
define('DIR_EXT', DATA_DIR.'/'.DIR_EXTENSIONS);
217+
define('DIR_EXT', DIR_ROOT.'/'.DIR_EXTENSIONS);
221218
define('DIR_EXT_CORE', '/core/');
222219
define('DIR_EXT_STORE', '/storefront/');
223220
define('DIR_EXT_ADMIN', '/admin/');

‎public_html/core/lib/package_manager.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ public function validate()
980980
*/
981981
public function getTempDir()
982982
{
983-
$tmp_dir = DIR_APP_SYSTEM.'temp';
983+
$tmp_dir = DIR_APP_SECTION.'system/temp';
984984
$tmp_install_dir = $tmp_dir.'/install';
985985
//try to create tmp dir if not yet created and install.
986986
if (make_writable_dir($tmp_dir) && make_writable_dir($tmp_install_dir)) {
@@ -992,7 +992,7 @@ public function getTempDir()
992992
$dir = sys_get_temp_dir().'/abantecart_install/';
993993

994994
if (!is_writable($dir)) {
995-
$error_text = 'Error: php tried to use directory '.DIR_APP_SYSTEM."temp/install"
995+
$error_text = 'Error: php tried to use directory '.DIR_APP_SECTION."system/temp/install"
996996
.' but it is non-writable. Temporary php-directory '.$dir
997997
.' is non-writable too! Please change permissions one of them.'."\n";
998998
$this->error .= $error_text;

‎public_html/download/index.html‎

Whitespace-only changes.

‎public_html/download/temp/index.html‎

Whitespace-only changes.

‎public_html/extensions/2checkout/admin/language/english/2checkout/2checkout.xml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0"?>
2+
<definitions>
3+
<definition>
4+
<key>2checkout_name</key>
5+
<value><![CDATA[2Checkout]]></value>
6+
</definition>
7+
<definition>
8+
<key>text_payment</key>
9+
<value><![CDATA[Payment]]></value>
10+
</definition>
11+
<definition>
12+
<key>text_success</key>
13+
<value><![CDATA[Success: You have modified 2Checkout account details!]]></value>
14+
</definition>
15+
<definition>
16+
<key>2checkout_note</key>
17+
<value><![CDATA[
18+
With this extension you can use 2Checkout payment system to accept payments from your customers.<br>
19+
<b>Sign up free today!  Use promo code ABANTECART2CO for a waiver of your application service fee (a savings of $10.99) and start selling online today! </b> Visit <a href="https://www.2checkout.com/signup/">www.2checkout.com</a>, complete the application, and then enter the code into the promo code field to take advantage of this special offer today!
20+
<br> Once register login to get account credentials to configure this extension
21+
<br>Don't forget to setup INS URL and Redirect URL here <a href="https://secure.2checkout.com/cpanel/webhooks_api.php">https://secure.2checkout.com/cpanel/webhooks_api.php</a>.
22+
<br><br>Your INS URL is <h4>#storefront#rt=extension/2checkout/callback</h4>
23+
<br><br>Also setup the Redirect URL and choose Return method "Header redirect".
24+
<br><br>Your Redirect URL is <h4>#storefront#rt=checkout/success</h4>
25+
]]></value>
26+
</definition>
27+
<definition>
28+
<key>2checkout_account</key>
29+
<value><![CDATA[2Checkout Merchant Code:]]></value>
30+
</definition>
31+
<definition>
32+
<key>2checkout_secret</key>
33+
<value>
34+
<![CDATA[Secret Key:<br /><span class="help">The secret word to confirm transactions with (must be the same as defined on the merchant account configuration page.</span>]]></value>
35+
</definition>
36+
<definition>
37+
<key>2checkout_test</key>
38+
<value><![CDATA[Test Mode:]]></value>
39+
</definition>
40+
<definition>
41+
<key>2checkout_test_1</key>
42+
<value><![CDATA[Yes]]></value>
43+
</definition>
44+
<definition>
45+
<key>2checkout_test_0</key>
46+
<value><![CDATA[No]]></value>
47+
</definition>
48+
<definition>
49+
<key>2checkout_order_status_id</key>
50+
<value><![CDATA[Order Status:]]></value>
51+
</definition>
52+
<definition>
53+
<key>2checkout_location_id</key>
54+
<value><![CDATA[Location:]]></value>
55+
</definition>
56+
<definition>
57+
<key>2checkout_location_id_0</key>
58+
<value><![CDATA[All Locations]]></value>
59+
</definition>
60+
<definition>
61+
<key>error_permission</key>
62+
<value><![CDATA[Warning: You do not have permission to modify payment 2Checkout!]]></value>
63+
</definition>
64+
<definition>
65+
<key>error_account</key>
66+
<value><![CDATA[Merchant Code Required!]]></value>
67+
</definition>
68+
<definition>
69+
<key>error_secret</key>
70+
<value><![CDATA[Secret Key Required!]]></value>
71+
</definition>
72+
</definitions>

‎public_html/extensions/2checkout/admin/language/russian/2checkout/2checkout.xml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<definitions>
3+
<definition>
4+
<key>2checkout_name</key>
5+
<value><![CDATA[2Checkout]]></value>
6+
</definition>
7+
<definition>
8+
<key>text_payment</key>
9+
<value><![CDATA[Оплата]]></value>
10+
</definition>
11+
<definition>
12+
<key>text_success</key>
13+
<value><![CDATA[Успешно: Вы изменили детали 2Сheckout аккаунта!]]></value>
14+
</definition>
15+
<definition>
16+
<key>2checkout_note</key>
17+
<value><![CDATA[
18+
С помощью этого расширения можно использовать платежную систему 2Сheckout принимать платежи от ваших клиентов. <br> <b>Зарегистрироваться бесплатно сегодня! Используйте промо-код ABANTECART2CO для отмены от платы за услуги заявки (экономия $10.99) и начните продавать онлайн сегодня!</b> Посетите <a href="https://www.2checkout.com/signup/">www.2checkout.com</a>, заполните заявление, а затем введите код в поле промо-кода, чтобы воспользоваться этим специальным предложением сегодня!
19+
<br> После регистрации войдите, чтобы получить учетные данные для настройки этого расширения
20+
<br>Не забудьте установить INS URL здесь <a href="https://secure.2checkout.com/cpanel/webhooks_api.php">https://secure.2checkout.com/cpanel/webhooks_api.php</a>.
21+
<br><br>Ваш URL INS <h4>#storefront#rt=extension/2checkout/callback</h4>
22+
<br><br>Также настройте URL-адрес перенаправления и выберите метод возврата «Перенаправление заголовка».
23+
<br><br>Ваш Redirect URL: <h4>#storefront#rt=checkout/success</h4>
24+
]]></value>
25+
</definition>
26+
<definition>
27+
<key>2checkout_account</key>
28+
<value><![CDATA[2Checkout Merchant Code:]]></value>
29+
</definition>
30+
<definition>
31+
<key>2checkout_secret</key>
32+
<value><![CDATA[Секретное слово:<br /><span class="help">Слово секрет для подтверждения сделки (должно быть таким же, как определено на странице конфигурации merchat аккаунта.</span>]]></value>
33+
</definition>
34+
<definition>
35+
<key>2checkout_test</key>
36+
<value><![CDATA[Тестовый режим:]]></value>
37+
</definition>
38+
<definition>
39+
<key>2checkout_test_1</key>
40+
<value><![CDATA[Да]]></value>
41+
</definition>
42+
<definition>
43+
<key>2checkout_test_0</key>
44+
<value><![CDATA[Нет]]></value>
45+
</definition>
46+
<definition>
47+
<key>2checkout_order_status_id</key>
48+
<value><![CDATA[Статус заказа:]]></value>
49+
</definition>
50+
<definition>
51+
<key>2checkout_location_id</key>
52+
<value><![CDATA[Географическая зона:]]></value>
53+
</definition>
54+
<definition>
55+
<key>2checkout_location_id_0</key>
56+
<value><![CDATA[Все местоположения]]></value>
57+
</definition>
58+
<definition>
59+
<key>error_permission</key>
60+
<value><![CDATA[Предупреждение: Вы не имеете прав на изменение 2Checkout!]]></value>
61+
</definition>
62+
<definition>
63+
<key>error_account</key>
64+
<value><![CDATA[Номер счета обязателен!]]></value>
65+
</definition>
66+
<definition>
67+
<key>error_secret</key>
68+
<value><![CDATA[Секретное слово обязательно!]]></value>
69+
</definition>
70+
</definitions>

‎public_html/extensions/2checkout/admin/language/spanish/2checkout/2checkout.xml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0"?>
2+
<definitions>
3+
<definition>
4+
<key>2checkout_name</key>
5+
<value><![CDATA[2Checkout]]></value>
6+
</definition>
7+
<definition>
8+
<key>text_payment</key>
9+
<value><![CDATA[Pago]]></value>
10+
</definition>
11+
<definition>
12+
<key>2checkout_note</key>
13+
<value><![CDATA[
14+
Con esta extensión, puede usar el sistema de pago 2Checkout para aceptar pagos de sus clientes. <br>
15+
<b> ¡Regístrese gratis hoy! Use el código de promoción ABANTECART2CO para obtener una exención de la tarifa de servicio de su solicitud (un ahorro de $ 10.99) y comience a vender en línea hoy.</b> Visite <a href="https://www.2checkout.com/signup/">www.2checkout.com</a>, complete la solicitud y luego ingrese el código en el campo del código de promoción para tomar aproveche esta oferta especial hoy!
16+
<br> Una vez que se registre, inicie sesión para obtener las credenciales de la cuenta para configurar esta extensión
17+
<br>No olvide configurar la URL INS y la URL de redireccionamiento aquí <a href="https://secure.2checkout.com/cpanel/webhooks_api.php">https://secure.2checkout.com/cpanel/webhooks_api.php</a>.
18+
<br><br>Su URL de INS es<h4>#storefront#rt=extension/2checkout/callback</h4>
19+
<br><br>También configure la URL de redireccionamiento y elija el método de retorno "Redireccionamiento de encabezado".
20+
<br><br>Su URL de redireccionamiento es <h4>#storefront#rt=checkout/success</h4>
21+
]]></value>
22+
</definition>
23+
<definition>
24+
<key>text_success</key>
25+
<value><![CDATA[Éxito: ha modificado los detalles de la cuenta de 2Checkout.]]></value>
26+
</definition>
27+
<definition>
28+
<key>2checkout_account</key>
29+
<value><![CDATA[2Checkout Merchant Code:]]></value>
30+
</definition>
31+
<definition>
32+
<key>2checkout_secret</key>
33+
<value>
34+
<![CDATA[Secret Key:<br /><span class="help">La palabra secreta para confirmar las transacciones (debe ser la misma que se define en la página de configuración de la cuenta del comerciante.</span>]]></value>
35+
</definition>
36+
<definition>
37+
<key>2checkout_test</key>
38+
<value><![CDATA[Modo de prueba:]]></value>
39+
</definition>
40+
<definition>
41+
<key>2checkout_test_1</key>
42+
<value><![CDATA[Si]]></value>
43+
</definition>
44+
<definition>
45+
<key>2checkout_test_0</key>
46+
<value><![CDATA[No]]></value>
47+
</definition>
48+
<definition>
49+
<key>2checkout_order_status_id</key>
50+
<value><![CDATA[Estado del pedido:]]></value>
51+
</definition>
52+
<definition>
53+
<key>2checkout_location_id</key>
54+
<value><![CDATA[Localidad:]]></value>
55+
</definition>
56+
<definition>
57+
<key>2checkout_location_id_0</key>
58+
<value><![CDATA[Todos las Localidades]]></value>
59+
</definition>
60+
<definition>
61+
<key>error_permission</key>
62+
<value><![CDATA[Advertencia: no tiene permiso para modificar el pago 2Checkout!]]></value>
63+
</definition>
64+
<definition>
65+
<key>error_account</key>
66+
<value><![CDATA[Número de cuenta requerido!]]></value>
67+
</definition>
68+
<definition>
69+
<key>error_secret</key>
70+
<value><![CDATA[¡Se requiere clave secreta!]]></value>
71+
</definition>
72+
</definitions>

‎public_html/extensions/2checkout/config.xml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0"?>
2+
<extension>
3+
<id>2checkout</id>
4+
<version>1.1.0</version>
5+
<type>payment</type>
6+
<category>payment</category>
7+
<cartversions>
8+
<item>1.3</item>
9+
</cartversions>
10+
<layout></layout>
11+
<priority>10</priority>
12+
<settings>
13+
<item id="2checkout_account">
14+
<type required="true">input</type>
15+
<default_value></default_value>
16+
</item>
17+
<item id="2checkout_secret">
18+
<type required="true">input</type>
19+
<default_value></default_value>
20+
</item>
21+
<item id="2checkout_test">
22+
<type>selectbox</type>
23+
<variants>
24+
<item>1</item>
25+
<item>0</item>
26+
</variants>
27+
</item>
28+
<item id="2checkout_order_status_id">
29+
<type>selectbox</type>
30+
<variants>
31+
<data_source>
32+
<model_rt>localisation/order_status</model_rt>
33+
<method>getOrderStatuses</method>
34+
</data_source>
35+
<fields>
36+
<field>order_status_id</field>
37+
<field>name</field>
38+
</fields>
39+
</variants>
40+
<default_value>2</default_value>
41+
</item>
42+
<item id="2checkout_location_id">
43+
<type>selectbox</type>
44+
<variants>
45+
<item>0</item>
46+
<data_source>
47+
<model_rt>localisation/location</model_rt>
48+
<method>getLocations</method>
49+
</data_source>
50+
<fields>
51+
<field>location_id</field>
52+
<field>name</field>
53+
</fields>
54+
</variants>
55+
</item>
56+
</settings>
57+
<note>true</note>
58+
</extension>

0 commit comments

Comments
 (0)