Changeset 18629

Timestamp:

Oct 12, 2012, 10:00:16 PM (12 years ago)

Author:

rvelices

Message:

• remove unsed code; shorten existing code and improve readability ...

Location:

trunk

Files:

• admin/extend_for_templates.php (modified) (1 diff)
• include/functions.inc.php (modified) (8 diffs)
• include/functions_user.inc.php (modified) (6 diffs)

trunk/admin/extend_for_templates.php

@@ -114 +114 @@
 $flip_templates = array_flip($eligible_templates);
 
+/**
+ * returns an array contening sub-directories, excluding ".svn"
+ *
+ * @param string $dir
+ * @return array
+ */
+function get_dirs($directory)
+{
+  $sub_dirs = array();
+  if ($opendir = opendir($directory))
+  {
+    while ($file = readdir($opendir))
+    {
+      if ($file != '.'
+          and $file != '..'
+          and is_dir($directory.'/'.$file)
+          and $file != '.svn')
+      {
+        array_push($sub_dirs, $file);
+      }
+    }
+    closedir($opendir);
+  }
+  return $sub_dirs;
+}
+
 $available_templates = array_merge(
   array('N/A' => '----------'),

trunk/include/functions.inc.php

@@ -124 +124 @@
   $pos = strrpos( $filename, '.' );
   return ($pos===false) ? $filename : substr( $filename, 0, $pos);
-}
-
-/**
- * returns an array contening sub-directories, excluding ".svn"
- *
- * @param string $dir
- * @return array
- */
-function get_dirs($directory)
-{
-  $sub_dirs = array();
-  if ($opendir = opendir($directory))
-  {
-    while ($file = readdir($opendir))
-    {
-      if ($file != '.'
-          and $file != '..'
-          and is_dir($directory.'/'.$file)
-          and $file != '.svn')
-      {
-        array_push($sub_dirs, $file);
-      }
-    }
-    closedir($opendir);
-  }
-  return $sub_dirs;
 }
 
@@ -1275 +1249 @@
   $languages = array_unique($languages);
 
+  /*Note: target charset is always utf-8
   if ( empty($options['target_charset']) )
   {
@@ -1283 +1258 @@
     $target_charset = $options['target_charset'];
   }
-  $target_charset = strtolower($target_charset);
+  $target_charset = strtolower($target_charset);*/
   $source_file    = '';
   foreach ($languages as $language)
@@ -1310 +1285 @@
       if ( !isset($lang_info) ) $lang_info=array();
 
+      /* Note: target charset is always utf-8
       if ( 'utf-8'!=$target_charset)
       {
@@ -1334 +1310 @@
       }
       else
-      {
+      {*/
         $lang = array_merge( $lang, (array)$load_lang );
         $lang_info = array_merge( $lang_info, (array)$load_lang_info );
-      }
+      //}
       return true;
     }
@@ -1343 +1319 @@
     {
       $content = @file_get_contents($source_file);
-      $content = convert_charset($content, 'utf-8', $target_charset);
+      //Note: target charset is always utf-8 $content = convert_charset($content, 'utf-8', $target_charset);
       return $content;
     }
@@ -1605 +1581 @@
 
   $options = array();
+  $label = '';
   foreach (array_reverse($conf['available_permission_levels']) as $level)
   {
-    $label = null;
-
     if (0 == $level)
     {
@@ -1615 +1590 @@
     else
     {
-      $labels = array();
-      $sub_levels = array_reverse($conf['available_permission_levels']);
-      foreach ($sub_levels as $sub_level)
+      if (strlen($label))
       {
-        if ($sub_level == 0 or $sub_level < $level)
-        {
-          break;
-        }
-        array_push(
-          $labels,
-          l10n(
-            sprintf(
-              'Level %d',
-              $sub_level
-              )
-            )
-          );
+        $label .= ', ';
       }
-
-      $label = implode(', ', $labels);
+      $label .= l10n( sprintf('Level %d',$level) );
     }
     $options[$level] = $label;

trunk/include/functions_user.inc.php

@@ -288 +288 @@
   global $conf;
 
-  $userdata = array();
-
   // retrieve basic user data
   $query = '
@@ -348 +346 @@
 
   // then merge basic + additional user data
-  $row = array_merge($row, $user_infos_row);
-
-  foreach ($row as $key => $value)
-  {
-    if (!is_numeric($key))
-    {
-      // If the field is true or false, the variable is transformed into a
-      // boolean value.
-      if ($value == 'true' or $value == 'false')
-      {
-        $userdata[$key] = get_boolean($value);
-      }
-      else
-      {
-        $userdata[$key] = $value;
-      }
-    }
-  }
+  $userdata = array_merge($row, $user_infos_row);
+
+  foreach ($userdata as &$value)
+  {
+      // If the field is true or false, the variable is transformed into a boolean value.
+      if ($value == 'true')
+      {
+        $value = true;
+      }
+      elseif ($value == 'false')
+      {
+        $value = false;
+      }
+  }
+  unset($value);
 
   if ($use_cache)
@@ -644 +639 @@
   if ($ref_level <> 0)
   {
-    array_push($list_cat_id, $cat_id);
+    $list_cat_id[] = $cat_id;
   }
 }
@@ -663 +658 @@
     if ($level > $ref_level)
     {
-      array_push($list_cat_id, $id);
+      $list_cat_id[] = $id;
     }
     else
     {
       compute_branch_cat_data($cats, $list_cat_id, $level, $ref_level);
-      array_push($list_cat_id, $id);
+      $list_cat_id[] = $id;
     }
     $ref_level = $level;
@@ -830 +825 @@
   if (is_array($cache['default_user']) and $convert_str)
   {
-    $default_user = array();
-    foreach ($cache['default_user'] as $name => $value)
-    {
-      // If the field is true or false, the variable is transformed into a
-      // boolean value.
-      if ($value == 'true' or $value == 'false')
-      {
-        $default_user[$name] = get_boolean($value);
-      }
-      else
-      {
-        $default_user[$name] = $value;
+    $default_user = $cache['default_user'];
+    foreach ($default_user as &$value)
+    {
+      // If the field is true or false, the variable is transformed into a boolean value.
+      if ($value == 'true')
+      {
+        $value = true;
+      }
+      elseif ($value == 'false')
+      {
+        $value = false;
       }
     }
@@ -985 +979 @@
           ));
 
-      array_push($inserts, $insert);
+      $inserts[] = $insert;
     }