Refactoring: improve defined and imported functions
git-svn-id: https://semanticscuttle.svn.sourceforge.net/svnroot/semanticscuttle/trunk@169 b3834d28-1941-0410-a4f8-b48e95affb8f
This commit is contained in:
parent
3c181054db
commit
5db18a09c4
4 changed files with 22 additions and 13 deletions
|
@ -1,14 +1,6 @@
|
|||
<?php
|
||||
// UTF-8 functions
|
||||
require_once(dirname(__FILE__) .'/includes/utf8.php');
|
||||
/* Define functions used into the application */
|
||||
|
||||
// Translation
|
||||
require_once(dirname(__FILE__) .'/includes/php-gettext/gettext.inc');
|
||||
$domain = 'messages';
|
||||
T_setlocale(LC_MESSAGES, $locale);
|
||||
T_bindtextdomain($domain, dirname(__FILE__) .'/locales');
|
||||
T_bind_textdomain_codeset($domain, 'UTF-8');
|
||||
T_textdomain($domain);
|
||||
|
||||
// Converts tags:
|
||||
// - direction = out: convert spaces to underscores;
|
||||
|
|
|
@ -3,7 +3,7 @@ if(!file_exists(dirname(__FILE__) .'/config.inc.php')) {
|
|||
die("Please, create the 'config.inc.php' file. You can copy the 'config.inc.php.example' file.");
|
||||
}
|
||||
|
||||
// First requirements part (before debug management)
|
||||
// 1 // First requirements part (before debug management)
|
||||
require_once(dirname(__FILE__) .'/config.inc.php');
|
||||
require_once(dirname(__FILE__) .'/constants.inc.php'); // some constants are based on variables from config file
|
||||
|
||||
|
@ -20,12 +20,25 @@ if(DEBUG_MODE) {
|
|||
error_reporting(0);
|
||||
}
|
||||
|
||||
|
||||
// Second requirements part which could display bugs (must come after debug management)
|
||||
// 2 // Second requirements part which could display bugs (must come after debug management)
|
||||
require_once(dirname(__FILE__) .'/services/servicefactory.php');
|
||||
require_once(dirname(__FILE__) .'/functions.inc.php');
|
||||
|
||||
|
||||
// 3 // Third requirements part which import functions from includes/ directory
|
||||
|
||||
// UTF-8 functions
|
||||
require_once(dirname(__FILE__) .'/includes/utf8.php');
|
||||
|
||||
// Translation
|
||||
require_once(dirname(__FILE__) .'/includes/php-gettext/gettext.inc');
|
||||
$domain = 'messages';
|
||||
T_setlocale(LC_MESSAGES, $locale);
|
||||
T_bindtextdomain($domain, dirname(__FILE__) .'/locales');
|
||||
T_bind_textdomain_codeset($domain, 'UTF-8');
|
||||
T_textdomain($domain);
|
||||
|
||||
|
||||
session_start();
|
||||
|
||||
?>
|
||||
|
|
|
@ -241,7 +241,9 @@ class Bookmark2TagService {
|
|||
message_die(GENERAL_ERROR, 'Could not get tags', '', __LINE__, __FILE__, $query, $this->db);
|
||||
return false;
|
||||
}
|
||||
return $this->db->sql_fetchrowset($dbresult);
|
||||
|
||||
$output = $this->db->sql_fetchrowset($dbresult);
|
||||
return $output;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
<?php
|
||||
/* Build services */
|
||||
|
||||
class ServiceFactory {
|
||||
function ServiceFactory(&$db, $serviceoverrules = array()) {
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue