Important translations

catalog/admin/action_recorder.php

@@ -174,7 +174,7 @@
                 <td colspan="5"><table border="0" width="100%" cellspacing="0" cellpadding="2">
                   <tr>
                     <td class="smallText" valign="top"><?php echo $actions_split->display_count($actions_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, $HTTP_GET_VARS['page'], TEXT_DISPLAY_NUMBER_OF_ENTRIES); ?></td>
-                    <td class="smallText" align="right"><?php echo $actions_split->display_links($actions_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $HTTP_GET_VARS['page'], (isset($HTTP_GET_VARS['module']) && in_array($HTTP_GET_VARS['module'], $modules_array) && is_object(${$HTTP_GET_VARS['module']}) ? 'module=' . $HTTP_GET_VARS['module'] : null) . '&' . (isset($HTTP_GET_VARS['search']) && !empty($HTTP_GET_VARS['search']) ? 'search=' . $HTTP_GET_VARS['search'] : null)); ?></td>
+                    <td class="smallText" align="right"><?php echo $actions_split->display_links($actions_query_numrows, MAX_DISPLAY_SEARCH_RESULTS, MAX_DISPLAY_PAGE_LINKS, $HTTP_GET_VARS['page'], (isset($HTTP_GET_VARS['module']) && in_array($HTTP_GET_VARS['module'], $modules_array) && is_object(${$HTTP_GET_VARS['module']}) ? 'module=' . $HTTP_GET_VARS['module'] : null) . (isset($HTTP_GET_VARS['search']) && !empty($HTTP_GET_VARS['search']) ? '&search=' . $HTTP_GET_VARS['search'] : null)); ?></td>
                   </tr>
                 </table></td>
               </tr>

catalog/admin/administrators.php

@@ -5,7 +5,7 @@
   osCommerce, Open Source E-Commerce Solutions
   http://www.oscommerce.com
 
-  Copyright (c) 2010 osCommerce
+  Copyright (c) 2013 osCommerce
 
   Released under the GNU General Public License
 */
@@ -54,44 +54,48 @@
         $username = tep_db_prepare_input($HTTP_POST_VARS['username']);
         $password = tep_db_prepare_input($HTTP_POST_VARS['password']);
 
-        $check_query = tep_db_query("select id from " . TABLE_ADMINISTRATORS . " where user_name = '" . tep_db_input($username) . "' limit 1");
+        if (ctype_alnum($password)) {
+          $check_query = tep_db_query("select id from " . TABLE_ADMINISTRATORS . " where user_name = '" . tep_db_input($username) . "' limit 1");
 
-        if (tep_db_num_rows($check_query) < 1) {
-          tep_db_query("insert into " . TABLE_ADMINISTRATORS . " (user_name, user_password) values ('" . tep_db_input($username) . "', '" . tep_db_input(tep_encrypt_password($password)) . "')");
+          if (tep_db_num_rows($check_query) < 1) {
+            tep_db_query("insert into " . TABLE_ADMINISTRATORS . " (user_name, user_password) values ('" . tep_db_input($username) . "', '" . tep_db_input(tep_encrypt_password($password)) . "')");
 
-          if (is_array($htpasswd_array)) {
-            for ($i=0, $n=sizeof($htpasswd_array); $i<$n; $i++) {
-              list($ht_username, $ht_password) = explode(':', $htpasswd_array[$i], 2);
+            if (is_array($htpasswd_array)) {
+              for ($i=0, $n=sizeof($htpasswd_array); $i<$n; $i++) {
+                list($ht_username, $ht_password) = explode(':', $htpasswd_array[$i], 2);
 
-              if ($ht_username == $username) {
-                unset($htpasswd_array[$i]);
+                if ($ht_username == $username) {
+                  unset($htpasswd_array[$i]);
+                }
               }
-            }
 
-            if (isset($HTTP_POST_VARS['htaccess']) && ($HTTP_POST_VARS['htaccess'] == 'true')) {
-              $htpasswd_array[] = $username . ':' . tep_crypt_apr_md5($password);
-            }
-
-            $fp = fopen(DIR_FS_ADMIN . '.htpasswd_oscommerce', 'w');
-            fwrite($fp, implode("\n", $htpasswd_array));
-            fclose($fp);
+              if (isset($HTTP_POST_VARS['htaccess']) && ($HTTP_POST_VARS['htaccess'] == 'true')) {
+                $htpasswd_array[] = $username . ':' . tep_crypt_apr_md5($password);
+              }
 
-            if (!in_array('AuthUserFile ' . DIR_FS_ADMIN . '.htpasswd_oscommerce', $htaccess_array) && !empty($htpasswd_array)) {
-              array_splice($htaccess_array, sizeof($htaccess_array), 0, $authuserfile_array);
-            } elseif (empty($htpasswd_array)) {
-              for ($i=0, $n=sizeof($htaccess_array); $i<$n; $i++) {
-                if (in_array($htaccess_array[$i], $authuserfile_array)) {
-                  unset($htaccess_array[$i]);
+              $fp = fopen(DIR_FS_ADMIN . '.htpasswd_oscommerce', 'w');
+              fwrite($fp, implode("\n", $htpasswd_array));
+              fclose($fp);
+
+              if (!in_array('AuthUserFile ' . DIR_FS_ADMIN . '.htpasswd_oscommerce', $htaccess_array) && !empty($htpasswd_array)) {
+                array_splice($htaccess_array, sizeof($htaccess_array), 0, $authuserfile_array);
+              } elseif (empty($htpasswd_array)) {
+                for ($i=0, $n=sizeof($htaccess_array); $i<$n; $i++) {
+                  if (in_array($htaccess_array[$i], $authuserfile_array)) {
+                    unset($htaccess_array[$i]);
+                  }
                 }
               }
-            }
 
-            $fp = fopen(DIR_FS_ADMIN . '.htaccess', 'w');
-            fwrite($fp, implode("\n", $htaccess_array));
-            fclose($fp);
+              $fp = fopen(DIR_FS_ADMIN . '.htaccess', 'w');
+              fwrite($fp, implode("\n", $htaccess_array));
+              fclose($fp);
+            }
+          } else {
+            $messageStack->add_session(ERROR_ADMINISTRATOR_EXISTS, 'error');
           }
         } else {
-          $messageStack->add_session(ERROR_ADMINISTRATOR_EXISTS, 'error');
+          $messageStack->add_session(ERROR_PASSWORD_CHARACTERS, 'error');
         }
 
         tep_redirect(tep_href_link(FILENAME_ADMINISTRATORS));
@@ -102,75 +106,79 @@
         $username = tep_db_prepare_input($HTTP_POST_VARS['username']);
         $password = tep_db_prepare_input($HTTP_POST_VARS['password']);
 
-        $check_query = tep_db_query("select id, user_name from " . TABLE_ADMINISTRATORS . " where id = '" . (int)$HTTP_GET_VARS['aID'] . "'");
-        $check = tep_db_fetch_array($check_query);
+        if (ctype_alnum($password)) {
+          $check_query = tep_db_query("select id, user_name from " . TABLE_ADMINISTRATORS . " where id = '" . (int)$HTTP_GET_VARS['aID'] . "'");
+          $check = tep_db_fetch_array($check_query);
 
-// update username in current session if changed
-        if ( ($check['id'] == $admin['id']) && ($check['user_name'] != $admin['username']) ) {
-          $admin['username'] = $username;
-        }
-
-// update username in htpasswd if changed
-        if (is_array($htpasswd_array)) {
-          for ($i=0, $n=sizeof($htpasswd_array); $i<$n; $i++) {
-            list($ht_username, $ht_password) = explode(':', $htpasswd_array[$i], 2);
-
-            if ( ($check['user_name'] == $ht_username) && ($check['user_name'] != $username) ) {
-              $htpasswd_array[$i] = $username . ':' . $ht_password;
-            }
+  // update username in current session if changed
+          if ( ($check['id'] == $admin['id']) && ($check['user_name'] != $admin['username']) ) {
+            $admin['username'] = $username;
           }
-        }
 
-        tep_db_query("update " . TABLE_ADMINISTRATORS . " set user_name = '" . tep_db_input($username) . "' where id = '" . (int)$HTTP_GET_VARS['aID'] . "'");
-
-        if (tep_not_null($password)) {
-// update password in htpasswd
+  // update username in htpasswd if changed
           if (is_array($htpasswd_array)) {
             for ($i=0, $n=sizeof($htpasswd_array); $i<$n; $i++) {
               list($ht_username, $ht_password) = explode(':', $htpasswd_array[$i], 2);
 
-              if ($ht_username == $username) {
-                unset($htpasswd_array[$i]);
+              if ( ($check['user_name'] == $ht_username) && ($check['user_name'] != $username) ) {
+                $htpasswd_array[$i] = $username . ':' . $ht_password;
               }
             }
+          }
+
+          tep_db_query("update " . TABLE_ADMINISTRATORS . " set user_name = '" . tep_db_input($username) . "' where id = '" . (int)$HTTP_GET_VARS['aID'] . "'");
+
+          if (tep_not_null($password)) {
+  // update password in htpasswd
+            if (is_array($htpasswd_array)) {
+              for ($i=0, $n=sizeof($htpasswd_array); $i<$n; $i++) {
+                list($ht_username, $ht_password) = explode(':', $htpasswd_array[$i], 2);
 
-            if (isset($HTTP_POST_VARS['htaccess']) && ($HTTP_POST_VARS['htaccess'] == 'true')) {
-              $htpasswd_array[] = $username . ':' . tep_crypt_apr_md5($password);
+                if ($ht_username == $username) {
+                  unset($htpasswd_array[$i]);
+                }
+              }
+
+              if (isset($HTTP_POST_VARS['htaccess']) && ($HTTP_POST_VARS['htaccess'] == 'true')) {
+                $htpasswd_array[] = $username . ':' . tep_crypt_apr_md5($password);
+              }
             }
-          }
 
-          tep_db_query("update " . TABLE_ADMINISTRATORS . " set user_password = '" . tep_db_input(tep_encrypt_password($password)) . "' where id = '" . (int)$HTTP_GET_VARS['aID'] . "'");
-        } elseif (!isset($HTTP_POST_VARS['htaccess']) || ($HTTP_POST_VARS['htaccess'] != 'true')) {
-          if (is_array($htpasswd_array)) {
-            for ($i=0, $n=sizeof($htpasswd_array); $i<$n; $i++) {
-              list($ht_username, $ht_password) = explode(':', $htpasswd_array[$i], 2);
+            tep_db_query("update " . TABLE_ADMINISTRATORS . " set user_password = '" . tep_db_input(tep_encrypt_password($password)) . "' where id = '" . (int)$HTTP_GET_VARS['aID'] . "'");
+          } elseif (!isset($HTTP_POST_VARS['htaccess']) || ($HTTP_POST_VARS['htaccess'] != 'true')) {
+            if (is_array($htpasswd_array)) {
+              for ($i=0, $n=sizeof($htpasswd_array); $i<$n; $i++) {
+                list($ht_username, $ht_password) = explode(':', $htpasswd_array[$i], 2);
 
-              if ($ht_username == $username) {
-                unset($htpasswd_array[$i]);
+                if ($ht_username == $username) {
+                  unset($htpasswd_array[$i]);
+                }
               }
             }
           }
-        }
 
-// write new htpasswd file
-        if (is_array($htpasswd_array)) {
-          $fp = fopen(DIR_FS_ADMIN . '.htpasswd_oscommerce', 'w');
-          fwrite($fp, implode("\n", $htpasswd_array));
-          fclose($fp);
+  // write new htpasswd file
+          if (is_array($htpasswd_array)) {
+            $fp = fopen(DIR_FS_ADMIN . '.htpasswd_oscommerce', 'w');
+            fwrite($fp, implode("\n", $htpasswd_array));
+            fclose($fp);
 
-          if (!in_array('AuthUserFile ' . DIR_FS_ADMIN . '.htpasswd_oscommerce', $htaccess_array) && !empty($htpasswd_array)) {
-            array_splice($htaccess_array, sizeof($htaccess_array), 0, $authuserfile_array);
-          } elseif (empty($htpasswd_array)) {
-            for ($i=0, $n=sizeof($htaccess_array); $i<$n; $i++) {
-              if (in_array($htaccess_array[$i], $authuserfile_array)) {
-                unset($htaccess_array[$i]);
+            if (!in_array('AuthUserFile ' . DIR_FS_ADMIN . '.htpasswd_oscommerce', $htaccess_array) && !empty($htpasswd_array)) {
+              array_splice($htaccess_array, sizeof($htaccess_array), 0, $authuserfile_array);
+            } elseif (empty($htpasswd_array)) {
+              for ($i=0, $n=sizeof($htaccess_array); $i<$n; $i++) {
+                if (in_array($htaccess_array[$i], $authuserfile_array)) {
+                  unset($htaccess_array[$i]);
+                }
               }
             }
-          }
 
-          $fp = fopen(DIR_FS_ADMIN . '.htaccess', 'w');
-          fwrite($fp, implode("\n", $htaccess_array));
-          fclose($fp);
+            $fp = fopen(DIR_FS_ADMIN . '.htaccess', 'w');
+            fwrite($fp, implode("\n", $htaccess_array));
+            fclose($fp);
+          }
+        } else {
+          $messageStack->add_session(ERROR_PASSWORD_CHARACTERS, 'error');
         }
 
         tep_redirect(tep_href_link(FILENAME_ADMINISTRATORS, 'aID=' . (int)$HTTP_GET_VARS['aID']));

catalog/admin/backup.php

@@ -40,9 +40,14 @@
                   '# Backup Date: ' . date(PHP_DATE_TIME_FORMAT) . "\n\n";
         fputs($fp, $schema);
 
-        $tables_query = tep_db_query('show tables');
+        $tables_query = tep_db_query('show full tables where Table_type = "BASE TABLE"');
         while ($tables = tep_db_fetch_array($tables_query)) {
-          list(,$table) = each($tables);
+
+          foreach ($tables as $tables_in_database) {
+            if ($tables_in_database != 'BASE TABLE') {
+              $table = $tables_in_database;
+            }
+          }
 
           $schema = 'drop table if exists ' . $table . ';' . "\n" .
                     'create table ' . $table . ' (' . "\n";

catalog/admin/banner_manager.php

@@ -268,7 +268,7 @@ function popupImageWindow(url) {
           </tr>
           <tr>
             <td valign="top" class="main"><?php echo TEXT_BANNERS_HTML_TEXT; ?></td>
-            <td class="main"><?php echo tep_draw_textarea_field('banners_html_text', 'soft', '60', '5', $bInfo->banners_html_text); ?></td>
+            <td class="main"><?php echo tep_draw_textarea_field('banners_html_text', '60', '5', $bInfo->banners_html_text); ?></td>
           </tr>
           <tr>
             <td colspan="2"><?php echo tep_draw_separator('pixel_trans.gif', '1', '10'); ?></td>