Merge pull request #1026 from gburton/1.0.7.11

1.0.7.11

README.md

@@ -60,18 +60,19 @@ Minimum | Maximum (tested)
 
 ## Language Packs
 
-Language | URL | Credit & Thanks | Comments
------------- | ------------- | ------------- | -------------
-DE | https://apps.oscommerce.com/zXxXN&german-language-deutsches-sprachpaket&v=cephoenix10 | cupidare |
-DK | https://apps.oscommerce.com/n6qft&danish-dansk-for-phoenix-1-0-7-9 | Kofod | Shop Side only
-ES | https://github.com/raiwa/OSCOM-CE-Phoenix-Spanish-language-idioma-espanol | raiwa | Certified Developer
-FR | https://apps.oscommerce.com/oqfJg&ce-phoenix-1-0-5-0-french-language-pack | artfulweb |
-NL | https://apps.oscommerce.com/NShzV&vertaling-nederlands | Fiber |
-NO | https://apps.oscommerce.com/ecntZ&norwegian-language-pack-phoenix | ra92 |
-PT (BR) | https://apps.oscommerce.com/yLxsO&oscom2ce-phoenix-pt-brasil-v1-0-5-0 | josmar | Brazilian Portuguese
-RU | https://apps.oscommerce.com/ub5yL&russian-for-phoenix | Fredi | Contains non-core files
-
-Please be aware that language packs are maintained by volunteers so may not be up to date.
+Language | URL | Credit & Thanks 
+------------ | ------------- | ------------- 
+DE | https://apps.oscommerce.com/zXxXN&german-language-deutsches-sprachpaket&v=cephoenix10 | cupidare
+DK | https://apps.oscommerce.com/n6qft&danish-dansk-for-phoenix-1-0-7-9 | Kofod 
+ES | https://github.com/raiwa/OSCOM-CE-Phoenix-Spanish-language-idioma-espanol | raiwa 
+FR | https://apps.oscommerce.com/oqfJg&ce-phoenix-1-0-5-0-french-language-pack | artfulweb 
+IT | https://github.com/bitit-it/phoenix-italian | bitit.it
+NL | https://apps.oscommerce.com/NShzV&vertaling-nederlands | Fiber 
+NO | https://apps.oscommerce.com/ecntZ&norwegian-language-pack-phoenix | ra92 
+PT (BR) | https://apps.oscommerce.com/yLxsO&oscom2ce-phoenix-pt-brasil-v1-0-5-0 | josmar 
+RU | https://apps.oscommerce.com/ub5yL&russian-for-phoenix | Fredi 
+
+Please be aware that language packs (other than ES) are maintained by shopowners so may not be up to date, may be incomplete or may contain non-core files and definitions.
 
 # Certified Service Providers
 
@@ -97,7 +98,7 @@ Channel | URL
 ------------ | -------------
 Phoenix Club | https://forums.oscommerce.com/forum/117-topics/
 Youtube | https://www.youtube.com/channel/UCjJe0ZX3-nGzeJFEzcVUyIA/
-Discord | https://discord.com/channels/769158803769655306/769158864523231252
+Discord | https://discord.gg/3pzfrtMAX4
 External Libraries | https://github.com/gburton/Responsive-osCommerce/wiki/External-Libraries
 Phoenix Cart Wiki | https://phoenixcart.org/phoenixcartwiki/index.php
 Phoenix Cart Forum | https://phoenixcart.org/forum/

admin/administrators.php

@@ -45,7 +45,7 @@
   }
 
   $action = $_GET['action'] ?? '';
-  
+
   $OSCOM_Hooks->call('administrators', 'preAction');
 
   if (tep_not_null($action)) {
@@ -95,7 +95,7 @@
         } else {
           $messageStack->add_session(ERROR_ADMINISTRATOR_EXISTS, 'error');
         }
-        
+
         $OSCOM_Hooks->call('administrators', 'insertAction');
 
         tep_redirect(tep_href_link('administrators.php'));
@@ -180,7 +180,7 @@
           fwrite($fp, implode("\n", $htaccess_array));
           fclose($fp);
         }
-        
+
         $OSCOM_Hooks->call('administrators', 'saveAction');
 
         tep_redirect(tep_href_link('administrators.php', 'aID=' . (int)$_GET['aID']));
@@ -222,14 +222,14 @@
             fclose($fp);
           }
         }
-        
+
         $OSCOM_Hooks->call('administrators', 'deleteConfirmAction');
 
         tep_redirect(tep_href_link('administrators.php'));
         break;
     }
   }
-  
+
   $OSCOM_Hooks->call('administrators', 'postAction');
 
   $secMessageStack = new messageStack();
@@ -337,8 +337,8 @@
 
       $contents = ['form' => tep_draw_form('administrator', 'administrators.php', 'action=insert', 'post', 'autocomplete="off"')];
       $contents[] = ['text' => TEXT_INFO_INSERT_INTRO];
-      $contents[] = ['text' => TEXT_INFO_USERNAME . tep_draw_input_field('username', null, 'required="required" autocapitalize="none" aria-required="true"')];
-      $contents[] = ['text' => TEXT_INFO_PASSWORD . tep_draw_input_field('password', null, 'required="required" autocapitalize="none" aria-required="true"', 'password')];
+      $contents[] = ['text' => TEXT_INFO_USERNAME . tep_draw_input_field('username', null, 'required autocapitalize="none" aria-required="true"')];
+      $contents[] = ['text' => TEXT_INFO_PASSWORD . tep_draw_input_field('password', null, 'required autocapitalize="none" aria-required="true"', 'password')];
 
       if (is_array($htpasswd_array)) {
         $contents[] = ['text' => '<div class="custom-control custom-switch">' . tep_draw_selection_field('htaccess', 'checkbox', 'true', null, 'class="custom-control-input" id="aHtpasswd"') . '<label for="aHtpasswd" class="custom-control-label text-muted"><small>' . TEXT_INFO_PROTECT_WITH_HTPASSWD . '</small></label></div>'];
@@ -351,8 +351,8 @@
 
       $contents = ['form' => tep_draw_form('administrator', 'administrators.php', 'aID=' . $aInfo->id . '&action=save', 'post', 'autocomplete="off"')];
       $contents[] = ['text' => TEXT_INFO_EDIT_INTRO];
-      $contents[] = ['text' => TEXT_INFO_USERNAME . tep_draw_input_field('username', $aInfo->user_name, 'required="required" autocapitalize="none" aria-required="true"')];
-      $contents[] = ['text' => TEXT_INFO_NEW_PASSWORD . tep_draw_input_field('password', null, 'required="required" autocapitalize="none" aria-required="true"', 'password')];
+      $contents[] = ['text' => TEXT_INFO_USERNAME . tep_draw_input_field('username', $aInfo->user_name, 'required autocapitalize="none" aria-required="true"')];
+      $contents[] = ['text' => TEXT_INFO_NEW_PASSWORD . tep_draw_input_field('password', null, 'required autocapitalize="none" aria-required="true"', 'password')];
 
       if (is_array($htpasswd_array)) {
         $default_flag = false;