Changeset 792 for trunk/admin

Timestamp:

Jun 11, 2005, 4:10:04 PM (19 years ago)

Author:

plg

Message:

• errors and informations boxes : management centralized in admin.php, $errors and $infos arrays replaced by $pageerrors and $pageinfos, special management for admin/update.php (more complex management)

Location:

trunk/admin

Files:

• cat_list.php (modified) (5 diffs)
• cat_modify.php (modified) (2 diffs)
• configuration.php (modified) (11 diffs)
• element_set_global.php (modified) (1 diff)
• element_set_unit.php (modified) (1 diff)
• group_list.php (modified) (6 diffs)
• picture_modify.php (modified) (4 diffs)
• remote_site.php (modified) (11 diffs)
• thumbnail.php (modified) (7 diffs)
• update.php (modified) (2 diffs)
• user_list.php (modified) (3 diffs)
• waiting.php (modified) (3 diffs)

trunk/admin/cat_list.php

@@ -34 +34 @@
 // |                            initialization                             |
 // +-----------------------------------------------------------------------+
-$errors = array();
-$infos = array();
 $categories = array();
 $navigation = $lang['home'];
@@ -45 +43 @@
 {
   delete_categories(array($_GET['delete']));
-  array_push($infos, $lang['cat_virtual_deleted']);
+  array_push($page['infos'], $lang['cat_virtual_deleted']);
   ordering();
   update_global_rank();
@@ -55 +53 @@
   if (preg_match('/^\s*$/', $_POST['virtual_name']))
   {
-    array_push($errors, $lang['cat_error_name']);
+    array_push($page['errors'], $lang['cat_error_name']);
   }
         
-  if (!count($errors))
+  if (!count($page['errors']))
   {
     $parent_id = !empty($_GET['parent_id'])?$_GET['parent_id']:'NULL';
@@ -137 +135 @@
     mass_inserts(CATEGORIES_TABLE, $dbfields, $inserts);
 
-    array_push($infos, $lang['cat_virtual_added']);
+    array_push($page['infos'], $lang['cat_virtual_added']);
   }
 }
@@ -345 +343 @@
 $tpl = array('cat_first','cat_last');
 // +-----------------------------------------------------------------------+
-// |                            errors & infos                             |
-// +-----------------------------------------------------------------------+
-if (count($errors) != 0)
-{
-  $template->assign_block_vars('errors',array());
-  foreach ($errors as $error)
-  {
-    $template->assign_block_vars('errors.error',array('ERROR'=>$error));
-  }
-}
-if (count($infos) != 0)
-{
-  $template->assign_block_vars('infos',array());
-  foreach ($infos as $info)
-  {
-    $template->assign_block_vars('infos.info',array('INFO'=>$info));
-  }
-}
-// +-----------------------------------------------------------------------+
 // |                          Categories display                           |
 // +-----------------------------------------------------------------------+

trunk/admin/cat_modify.php

@@ -82 +82 @@
   set_cat_status(array($_GET['cat_id']), $_POST['status']);
 
-  $template->assign_block_vars('confirmation' ,array());
+  array_push($infos, $lang['editcat_confirm']);
 }
 else if (isset($_POST['set_random_representant']))
@@ -145 +145 @@
   $uploadable=>'checked="checked"',
   
-  'L_EDIT_CONFIRM'=>$lang['editcat_confirm'],
   'L_EDIT_NAME'=>$lang['name'],
   'L_STORAGE'=>$lang['storage'],

trunk/admin/configuration.php

@@ -54 +54 @@
 }                                          
 //------------------------------ verification and registration of modifications
-$errors = array();
 if (isset($_POST['submit']))
 {
@@ -65 +64 @@
       if (!preg_match('/^[\w-]*$/', $_POST['prefix_thumbnail']))
       {
-        array_push($errors, $lang['conf_prefix_thumbnail_error']);
+        array_push($page['errors'], $lang['conf_prefix_thumbnail_error']);
       }
       // mail must be formatted as follows : name@server.com
@@ -71 +70 @@
       if (!preg_match($pattern, $_POST['mail_webmaster']))
       {
-        array_push($errors, $lang['conf_mail_webmaster_error']);
+        array_push($page['errors'], $lang['conf_mail_webmaster_error']);
       }
       break;
@@ -83 +82 @@
            or $_POST['nb_comment_page'] > 50)
       {
-        array_push($errors, $lang['conf_nb_comment_page_error']);
+        array_push($page['errors'], $lang['conf_nb_comment_page_error']);
       }
       break;
@@ -93 +92 @@
           or $_POST['recent_period'] <= 0)
       {
-        array_push($errors, $lang['periods_error']);
+        array_push($page['errors'], $lang['periods_error']);
       }
       break;
@@ -104 +103 @@
           or $_POST['upload_maxfilesize'] > 1000)
       {
-        array_push($errors, $lang['conf_upload_maxfilesize_error']);
+        array_push($page['errors'], $lang['conf_upload_maxfilesize_error']);
       }
       
@@ -114 +113 @@
       {
         if (!preg_match($int_pattern, $_POST[$field])
-          or $_POST[$field] < 10)
+            or $_POST[$field] < 10)
         {
-          array_push($errors, $lang['conf_'.$field.'_error']);
+          array_push($page['errors'], $lang['conf_'.$field.'_error']);
         }
       }
@@ -124 +123 @@
   
   // updating configuration if no error found
-  if (count($errors) == 0)
-  {
+  if (count($page['errors']) == 0)
+  {
+    echo '<pre>'; print_r($_POST); echo '</pre>';
     $result = pwg_query('SELECT * FROM '.CONFIG_TABLE);
     while ($row = mysql_fetch_array($result))
@@ -139 +139 @@
       }
     }
+    array_push($page['infos'], $lang['conf_confirmation']);
   }
 }
@@ -150 +151 @@
 $template->assign_vars(
   array(
-    'L_CONFIRM'=>$lang['conf_confirmation'],
     'L_YES'=>$lang['yes'],
     'L_NO'=>$lang['no'],
@@ -344 +344 @@
   }
 }
-//-------------------------------------------------------------- errors display
-if ( sizeof( $errors ) != 0 )
-{
-  $template->assign_block_vars('errors',array());
-  for ( $i = 0; $i < sizeof( $errors ); $i++ )
-  {
-    $template->assign_block_vars('errors.error',array('ERROR'=>$errors[$i]));
-  }
-}
-elseif ( isset( $_POST['submit'] ) )
-{
-  $template->assign_block_vars('confirmation' ,array());
-}
 //----------------------------------------------------------- sending html code
 $template->assign_var_from_handle('ADMIN_CONTENT', 'config');

trunk/admin/element_set_global.php

@@ -75 +75 @@
 // |                       global mode form submission                     |
 // +-----------------------------------------------------------------------+
-$errors = array();
 
 if (isset($_POST['submit']))

trunk/admin/element_set_unit.php

@@ -41 +41 @@
 // |                        unit mode form submission                      |
 // +-----------------------------------------------------------------------+
-$errors = array();
 
 if (isset($_POST['submit']))

trunk/admin/group_list.php

@@ -32 +32 @@
 
 //-------------------------------------------------------------- delete a group
-$error = array();
 if ( isset( $_POST['delete'] ) && isset( $_POST['confirm_delete'] )  )
 {
@@ -58 +57 @@
        or preg_match( '/"/', $_POST['newgroup'] ) )
   {
-    array_push( $error, $lang['group_add_error1'] );
+    array_push( $page['errors'], $lang['group_add_error1'] );
   }
-  if ( count( $error ) == 0 )
+  if ( count( $page['errors'] ) == 0 )
   {
     // is the group not already existing ?
@@ -69 +68 @@
     if ( mysql_num_rows( $result ) > 0 )
     {
-      array_push( $error, $lang['group_add_error2'] );
+      array_push( $page['errors'], $lang['group_add_error2'] );
     }
   }
-  if ( count( $error ) == 0 )
+  if ( count( $page['errors'] ) == 0 )
   {
     // creating the group
@@ -81 +80 @@
   }
 }
-//--------------------------------------------------------------- user management
+//------------------------------------------------------------- user management
 elseif ( isset( $_POST['add'] ) )
 {
@@ -87 +86 @@
   if (!$userdata)
   {
-    array_push($error, $lang['user_err_unknown']);
+    array_push($page['errors'], $lang['user_err_unknown']);
   }
   else
@@ -113 +112 @@
         $query.= ') AND group_id = '.$_POST['edit_group_id'];
         pwg_query( $query );
-}
-//-------------------------------------------------------------- errors display
-if ( sizeof( $error ) != 0 )
-{
-  $template->assign_block_vars('errors',array());
-  for ( $i = 0; $i < sizeof( $error ); $i++ )
-  {
-    $template->assign_block_vars('errors.error',array('ERROR'=>$error[$i]));
-  }
 }
 //----------------------------------------------------------------- groups list

trunk/admin/picture_modify.php

@@ -32 +32 @@
 include_once(PHPWG_ROOT_PATH.'admin/include/isadmin.inc.php');
 //--------------------------------------------------------- update informations
-$errors = array();
 // first, we verify whether there is a mistake on the given creation date
 if (isset($_POST['date_creation']) and !empty($_POST['date_creation']))
@@ -38 +37 @@
   if (!check_date_format($_POST['date_creation']))
   {
-    array_push($errors, $lang['err_date']);
-  }
-}
-if (isset($_POST['submit']) and count($errors) == 0)
+    array_push($page['errors'], $lang['err_date']);
+  }
+}
+if (isset($_POST['submit']) and count($page['errors']) == 0)
 {
   $query = 'UPDATE '.IMAGES_TABLE.' SET name = ';
@@ -161 +160 @@
 $url_img = PHPWG_ROOT_PATH.'picture.php?image_id='.$_GET['image_id'];
 $url_img .= '&cat='.$row['storage_category_id'];
-$date = isset($_POST['date_creation']) && empty($errors)
+$date = isset($_POST['date_creation']) && empty($page['errors'])
 ?$_POST['date_creation']:date_convert_back(@$row['date_creation']);
 
@@ -213 +212 @@
  ));
   
-//-------------------------------------------------------------- errors display
-if (count($errors) != 0)
-{
-  $template->assign_block_vars('errors',array());
-  foreach ($errors as $error)
-  {
-    $template->assign_block_vars('errors.error',array('ERROR'=>$error));
-  }
-}
-
 // associate to another category ?
 $query = '

trunk/admin/remote_site.php

@@ -46 +46 @@
 function remote_output($url)
 {
-  global $template, $errors, $lang;
+  global $template, $page, $lang;
   
   if($lines = @file($url))
@@ -69 +69 @@
   else
   {
-    array_push($errors, $lang['remote_site_file_not_found']);
+    array_push($page['errors'], $lang['remote_site_file_not_found']);
   }
 }
@@ -121 +121 @@
 function update_remote_site($listing_file, $site_id)
 {
-  global $lang, $counts, $template, $removes, $errors;
+  global $lang, $counts, $template, $removes, $page;
   
   if (@fopen($listing_file, 'r'))
@@ -160 +160 @@
   else
   {
-    array_push($errors, $lang['remote_site_listing_not_found']);
+    array_push($page['errors'], $lang['remote_site_listing_not_found']);
   }
 }
@@ -519 +519 @@
 // |                        new site creation form                         |
 // +-----------------------------------------------------------------------+
-$errors = array();
-
 if (isset($_POST['submit']))
 {
@@ -526 +524 @@
   if (!preg_match('/^https?:\/\/[~\/\.\w-]+$/', $_POST['galleries_url']))
   {
-    array_push($errors, $lang['remote_site_uncorrect_url']);
+    array_push($page['errors'], $lang['remote_site_uncorrect_url']);
   }
   else
@@ -543 +541 @@
     if ($row['count'] > 0)
     {
-      array_push($errors, $lang['remote_site_already_exists']);
-    }
-  }
-
-  if (count($errors) == 0)
+      array_push($page['errors'], $lang['remote_site_already_exists']);
+    }
+  }
+
+  if (count($page['errors']) == 0)
   {
     $url = $page['galleries_url'].'create_listing_file.php';
@@ -557 +555 @@
       if (!preg_match('/^PWG-INFO-2:/', $first_line))
       {
-        array_push($errors, $lang['remote_site_error'].' : '.$first_line);
+        array_push($page['errors'],
+                   $lang['remote_site_error'].' : '.$first_line);
       }
     }
     else
     {
-      array_push($errors, $lang['remote_site_file_not_found']);
-    }
-  }
-  
-  if (count($errors) == 0)
+      array_push($page['errors'], $lang['remote_site_file_not_found']);
+    }
+  }
+  
+  if (count($page['errors']) == 0)
   {
     $query = '
@@ -576 +575 @@
     pwg_query($query);
 
-    $template->assign_block_vars(
-      'confirmation',
-      array(
-        'CONTENT'=>$page['galleries_url'].' '.$lang['remote_site_created']
-        ));
+    array_push($page['infos'],
+               $page['galleries_url'].' '.$lang['remote_site_created']);
   }
 }
@@ -608 +604 @@
     {
       delete_site($page['site']);
-
-      $template->assign_block_vars(
-        'confirmation',
-        array(
-          'CONTENT'=>$galleries_url.' '.$lang['remote_site_deleted']
-          ));
-      
+      array_push($page['infos'],
+                 $galleries_url.' '.$lang['remote_site_deleted']);
       break;
     }
@@ -739 +730 @@
 }
 // +-----------------------------------------------------------------------+
-// |                             errors display                            |
-// +-----------------------------------------------------------------------+
-if (count($errors) != 0)
-{
-  $template->assign_block_vars('errors',array());
-  foreach ($errors as $error)
-  {
-    $template->assign_block_vars('errors.error',array('ERROR'=>$error));
-  }
-}
-// +-----------------------------------------------------------------------+
 // |                           sending html code                           |
 // +-----------------------------------------------------------------------+

trunk/admin/thumbnail.php

@@ -32 +32 @@
 function RatioResizeImg($path, $newWidth, $newHeight, $tn_ext)
 {
-  global $conf, $lang, $errors;
+  global $conf, $lang, $page;
 
   $filename = basename($path);
@@ -101 +101 @@
       if (!is_writable($dirname))
       {
-        array_push($errors, '['.$dirname.'] : '.$lang['no_write_access']);
+        array_push($page['errors'],
+                   '['.$dirname.'] : '.$lang['no_write_access']);
         return false;
       }
@@ -115 +116 @@
     if (!is_writable($tndir))
     {
-      array_push($errors, '['.$tndir.'] : '.$lang['no_write_access']);
+      array_push($page['errors'], '['.$tndir.'] : '.$lang['no_write_access']);
       return false;
     }
@@ -149 +150 @@
 }
 
-$errors = array();
 $pictures = array();
 $stats = array();
@@ -248 +248 @@
 if (isset($_POST['submit']))
 {
-  $errors = array();
   $times = array();
   $infos = array();
@@ -255 +254 @@
   if (!ereg('^[0-9]{2,3}$', $_POST['width']) or $_POST['width'] < 10)
   {
-    array_push($errors, $lang['tn_err_width'].' 10');
+    array_push($page['errors'], $lang['tn_err_width'].' 10');
   }
   if (!ereg('^[0-9]{2,3}$', $_POST['height']) or $_POST['height'] < 10)
   {
-    array_push($errors, $lang['tn_err_height'].' 10');
+    array_push($page['errors'], $lang['tn_err_height'].' 10');
   }
   
   // picture miniaturization
-  if (count($errors) == 0)
+  if (count($page['errors']) == 0)
   {
     $num = 1;
@@ -346 +345 @@
 }
 // +-----------------------------------------------------------------------+
-// |                            errors display                             |
-// +-----------------------------------------------------------------------+
-if (count($errors) != 0)
-{
-  $template->assign_block_vars('errors',array());
-  foreach ($errors as $error)
-  {
-    $template->assign_block_vars('errors.error',array('ERROR'=>$error));
-  }
-}
-// +-----------------------------------------------------------------------+
 // |             form & pictures without thumbnails display                |
 // +-----------------------------------------------------------------------+

trunk/admin/update.php

@@ -655 +655 @@
   if (count($errors) > 0)
   {
-    $template->assign_block_vars('update.errors', array());
+    $template->assign_block_vars('update.update_errors', array());
     foreach ($errors as $error)
     {
       $template->assign_block_vars(
-        'update.errors.error',
+        'update.update_errors.update_error',
         array(
           'ELEMENT' => $error['path'],
@@ -670 +670 @@
       and $_POST['display_info'] == 1)
   {
-    $template->assign_block_vars('update.infos', array());
+    $template->assign_block_vars('update.update_infos', array());
     foreach ($infos as $info)
     {
       $template->assign_block_vars(
-        'update.infos.info',
+        'update.update_infos.update_info',
         array(
           'ELEMENT' => $info['path'],

trunk/admin/user_list.php

@@ -46 +46 @@
 if (isset($_POST['submit_add']))
 {
-  $errors = register_user($_POST['login'],
-                          $_POST['password'],
-                          $_POST['password'],
-                          '');
+  $page['errors'] = register_user($_POST['login'],
+                                  $_POST['password'],
+                                  $_POST['password'],
+                                  '');
 }
 
@@ -55 +55 @@
 // |                       preferences form submission                     |
 // +-----------------------------------------------------------------------+
-
-$errors = array();
 
 if (isset($_POST['pref_submit']))
@@ -194 +192 @@
 $base_url = add_session_id(PHPWG_ROOT_PATH.'admin.php?page=user_list');
 
-$conf['users_page'] = 20;
+$conf['users_page'] = 10;
 
 if (isset($_GET['start']) and is_numeric($_GET['start']))

trunk/admin/waiting.php

@@ -73 +73 @@
     }
   }
+  array_push($infos, $lang['waiting_update']);
 }
 
@@ -78 +79 @@
 $template->set_filenames(array('waiting'=>'admin/waiting.tpl'));
 $template->assign_vars(array(
-  'L_WAITING_CONFIRMATION'=>$lang['waiting_update'],
   'L_AUTHOR'=>$lang['author'],
   'L_THUMBNAIL'=>$lang['thumbnail'],
@@ -91 +91 @@
   ));
   
-//-------------------------------------------------------- confirmation message
-if (isset($_POST['submit']))
-{
-  $template->assign_block_vars('confirmation' ,array());
-}
 //---------------------------------------------------------------- form display
 $cat_names = array();