[Customisation Database Commits] r839 - in /trunk/titania: includes/manage_tools/organize_lang.php includes/manage_tools/reindex.php language/en/manage_tools/reindex.php manage/administration.php

[Nathan Guse]

Author: exreaction
Date: Tue Mar 23 03:45:39 2010
New Revision: 839

Log:
Give a nice back link

Modified:
    trunk/titania/includes/manage_tools/organize_lang.php
    trunk/titania/includes/manage_tools/reindex.php
    trunk/titania/language/en/manage_tools/reindex.php
    trunk/titania/manage/administration.php

Modified: trunk/titania/includes/manage_tools/organize_lang.php
==============================================================================
*** trunk/titania/includes/manage_tools/organize_lang.php (original)
--- trunk/titania/includes/manage_tools/organize_lang.php Tue Mar 23 03:45:39 2010
***************
*** 68,74 ****
  
  		organize_lang($file);
  
! 		trigger_error('ORGANIZE_LANG_SUCCESS');
  	}
  }
  
--- 68,74 ----
  
  		organize_lang($file);
  
! 		trigger_back('ORGANIZE_LANG_SUCCESS');
  	}
  }
  
***************
*** 216,222 ****
  			return;
  		}
  
! 		trigger_error('Bad Language File. language/' . $file);
  	}
  
  	// setup the $output var
--- 216,222 ----
  			return;
  		}
  
! 		trigger_back('Bad Language File. language/' . $file);
  	}
  
  	// setup the $output var
***************
*** 251,257 ****
  				return;
  			}
  
! 			trigger_error('Please make sure you are using UNIX line endings.');
  		}
  	}
  
--- 251,257 ----
  				return;
  			}
  
! 			trigger_back('Please make sure you are using UNIX line endings.');
  		}
  	}
  

Modified: trunk/titania/includes/manage_tools/reindex.php
==============================================================================
*** trunk/titania/includes/manage_tools/reindex.php (original)
--- trunk/titania/includes/manage_tools/reindex.php Tue Mar 23 03:45:39 2010
***************
*** 61,67 ****
  			break;
  
  			case 3 :
! 				trigger_error('Done!');
  			break;
  		}
  
--- 61,67 ----
  			break;
  
  			case 3 :
! 				trigger_back('Done!');
  			break;
  		}
  
***************
*** 76,81 ****
  			meta_refresh(0, titania_url::build_url('manage/administration', array('t' => 'reindex', 'section' => $section, 'start' => ($start + $limit), 'submit' => 1, 'hash' => generate_link_hash('manage'))));
  		}
  
! 		trigger_error($display_message . ' - section ' . $section . ' of 2' . ((($start + $limit) < $total) ? ' - part ' . ($start + $limit) . ' of ' . $total : ''));
  	}
  }
\ No newline at end of file
--- 76,81 ----
  			meta_refresh(0, titania_url::build_url('manage/administration', array('t' => 'reindex', 'section' => $section, 'start' => ($start + $limit), 'submit' => 1, 'hash' => generate_link_hash('manage'))));
  		}
  
! 		trigger_error($display_message . ' - section ' . $section . ' of 2 - ' . ((($start + $limit) < $total) ? 'part ' . ($start + $limit) . ' of ' . $total : 'Done'));
  	}
  }
\ No newline at end of file

Modified: trunk/titania/language/en/manage_tools/reindex.php
==============================================================================
*** trunk/titania/language/en/manage_tools/reindex.php (original)
--- trunk/titania/language/en/manage_tools/reindex.php Tue Mar 23 03:45:39 2010
***************
*** 38,43 ****
  //
  
  $lang = array_merge($lang, array(
! 	'REINDEX'					=> 'Reindex Search',
! 	'REINDEX_CONFIRM'			=> 'Are you sure you\'d like to begin reindexing the search system?  This can take a significantly long period of time.',
  ));
--- 38,43 ----
  //
  
  $lang = array_merge($lang, array(
! 	'REINDEX'			=> 'Reindex Search',
! 	'REINDEX_CONFIRM'	=> 'Are you sure you\'d like to begin reindexing the search system?  This can take a significantly long period of time.',
  ));

Modified: trunk/titania/manage/administration.php
==============================================================================
*** trunk/titania/manage/administration.php (original)
--- trunk/titania/manage/administration.php Tue Mar 23 03:45:39 2010
***************
*** 168,171 ****
--- 168,180 ----
  {
  	titania::page_header('ADMINISTRATION');
  	titania::page_footer(true, 'manage/administration.html');
+ }
+ 
+ function trigger_back($message)
+ {
+ 	$message = (isset(phpbb::$user->lang[$message])) ? phpbb::$user->lang[$message] : $message;
+ 
+ 	$message .= '<br /><br /><a href="' . titania_url::build_url('manage/administration') . '">' . phpbb::$user->lang['BACK'] . '</a>';
+ 
+ 	trigger_error($message);
  }
\ No newline at end of file