Restructure fo namespace layout

5 files changed, 34 insertions, 162 deletions

diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
deleted file mode 100644
index 13b5684..0000000
--- a/admin/upgrade_inc.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-global $gBitSystem, $gUpgradeFrom, $gUpgradeTo;
-
-$upgrades = array(
-
-'BONNIE' => array(
-	'BWR1' => array(
-
-// STEP 2
-array( 'DATADICT' => array(
-	array( 'DROPTABLE' => array(
-		'tiki_language', 'tiki_languages', 'tiki_untranslated',
-	)),
-	array( 'CREATE' => array (
-		'tiki_i18n_languages' => "
-			lang_code C(32) PRIMARY,
-			native_name C(255),
-			english_name C(255),
-			is_disabled C(1)
-		",
-
-		'tiki_i18n_masters' => "
-			source_hash C(32) PRIMARY,
-			package C(100),
-			created I8 NOTNULL,
-			source X NOTNULL
-		",
-
-		'tiki_i18n_strings' => "
-			source_hash C(32) PRIMARY,
-			lang_code C(32) PRIMARY,
-			last_modified I8 NOTNULL,
-			tran X NOTNULL
-		",
-
-		'tiki_i18n_version_map' => "
-			source_hash C(32) PRIMARY,
-			version C(32)
-		"
-	)),
-)),
-
-// STEP 3
-array( 'DATADICT' => array(
-	array( 'CREATEINDEX' => array(
-		'tiki_i18n_masters_pkg_idx' => array( 'tiki_i18n_masters', '`package`', array() ),
-		'tiki_i18n_strings_lang_idx' => array( 'tiki_i18n_strings', '`lang`', array() ),
-		'tiki_i18n_strings_lang_idx' => array( 'tiki_i18n_strings', '`source_hash`', array() ),
-		'tiki_tiki_i18n_version_src_idx' => array( 'tiki_i18n_version_map', '`source_hash`', array() ),
-		'tiki_tiki_i18n_version_ver_idx' => array( 'tiki_i18n_version_map', '`version`', array() ),
-	)),
-)),
-
-// STEP 4 - add some defaults
-array( 'QUERY' =>
-	array( 'SQL92' => array(
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('ar', 'ﺎﻠﻋﺮﺒﻳﺓ', 'Arabic' )",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('cs', 'Český', 'Czech')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('da', 'Dansk', 'Danish')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('de', 'Deutsch', 'German')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('en', 'English', 'English')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('en-uk', 'British English', NULL)",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('es', 'Español', 'Spanish')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('el', 'Greek', 'Greek')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('fr', 'Français', 'French')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('hr', 'Hrvatski', 'Croatian' )",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('hu', 'Magyar', 'Hungarian' )",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('it', 'Italiano', 'Italian')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('ja', '日本語', 'Japanese')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('ko', '한국말', 'Korean')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('nl', 'Nederlands', 'Dutch')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('no', 'Norwegian', 'Norwegian')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('pl', 'Polish', 'Polish')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('pt', 'Português', 'Portuguese' )",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('pt-br', 'Português Brasileiro', 'Brazilian Portuguese')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('ru', 'Russian', 'Russian')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('sb', 'Pijin Solomon', 'Pijin Solomon')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('sk', 'Slovenský', 'Slovak')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('sr', 'Српски', 'Serbian')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('sr-latn', 'Srpski', 'Serbian Latin' )",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('sv', 'Svenska', 'Swedish')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('tw', '中文(繁体字)', 'Traditional Chinese')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('tv', 'Tuvaluan', NULL )",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('uk', 'Українська', 'Ukrainian')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('zh-cn', 'Chinese', 'Chinese')",
-		"INSERT INTO `".BIT_DB_PREFIX."tiki_i18n_languages` (`lang_code`,`native_name`,`english_name`) VALUES ('ca', 'Catalan', 'Catalan')",
-	)),
-),
-
-	)
-),
-
-	'BWR1' => array(
-		'BWR2' => array(
-// de-tikify tables
-array( 'DATADICT' => array(
-	array( 'RENAMETABLE' => array(
-		'tiki_i18n_languages' => 'i18n_languages',
-		'tiki_i18n_masters' => 'i18n_masters',
-		'tiki_i18n_strings' => 'i18n_strings',
-		'tiki_i18n_version_map' => 'i18n_version_map',
-	)),
-	array( 'ALTER' => array(
-		'i18n_languages' => array(
-			'left_to_right' => array( '`left_to_right`', 'VARCHAR(1)' ),
-		)
-	)),
-	array( 'CREATE' => array (
-		'i18n_content_trans_map' => "
-			content_id I4 NOTNULL,
-			translation_id I4 NOTNULL
-			CONSTRAINT ', CONSTRAINT `liberty_translation_ref` FOREIGN KEY (`content_id`) REFERENCES `".BIT_DB_PREFIX."liberty_content`( `content_id` )'
-		",
-	)),
-	array( 'RENAMECOLUMN' => array(
-		'i18n_strings' => array(
-			'`tran`' => '`trans` X NOTNULL'
-		),
-	)),
-)),
-		)
-	),
-);
-
-if( isset( $upgrades[$gUpgradeFrom][$gUpgradeTo] ) ) {
-	$gBitSystem->registerUpgrade( LANGUAGES_PKG_NAME, $upgrades[$gUpgradeFrom][$gUpgradeTo] );
-}
-
-
-?>
diff --git a/admin/upgrades/2.0.0.php b/admin/upgrades/5.0.0.php
index d1f0b7f..05afa5e 100644..100755
--- a/admin/upgrades/2.0.0.php
+++ b/admin/upgrades/5.0.0.php
@@ -4,10 +4,9 @@
  */
 global $gBitInstaller;
 
-$infoHash = array(
+$infoHash = [
 	'package'      => LANGUAGES_PKG_NAME,
 	'version'      => str_replace( '.php', '', basename( __FILE__ )),
 	'description'  => "Set core package version number.",
-);
+];
 $gBitInstaller->registerPackageUpgrade( $infoHash );
-?>
diff --git a/Babelfish.php b/includes/classes/Babelfish.php
index ce1987f..8029db5 100644..100755
--- a/Babelfish.php
+++ b/includes/classes/Babelfish.php
@@ -134,10 +134,10 @@ class Babelfish {
 
 		// If we have already translated this page (babelfish=en_fr), then don't display the strings again
 		if (!isset($fishes[$lang_from]) || isset($_GET['babelfish'])) {
-			return array();
+			return [];
 		}
 
-		$a = array();
+		$a = [];
 		foreach ($fishes[$lang_from] as $lang_to => $msg) {
 			$a[] = array('target' => $lang_to,
                          'href'   => Babelfish::url($lang_from, $lang_to),
diff --git a/Bablotron.php b/includes/classes/Bablotron.php
index 8be8ba2..ca33be6 100644..100755
--- a/Bablotron.php
+++ b/includes/classes/Bablotron.php
@@ -67,7 +67,7 @@ class Bablotron extends BitBase
     function spellcheck_text($text, $threshold = 5)
     {
         $words = preg_split("/\s/", $text);
-        $results = array();
+        $results = [];
         foreach ($words as $word)
         {
             if (!$this->word_exists($word))
@@ -85,7 +85,7 @@ class Bablotron extends BitBase
     */
     function spellcheck_word($word, $threshold = 5)
     {
-        $results = array();
+        $results = [];
         if (!$this->word_exists($word))
         {
             $results[$word] = $this->find_similar_words($word, $threshold);
@@ -101,7 +101,7 @@ class Bablotron extends BitBase
     function quick_spellcheck_text($text, $threshold = 5)
     {
         $words = preg_split("/\s/", $text);
-        $results = array();
+        $results = [];
         foreach ($words as $word)
         {
             if (!$this->word_exists($word))
@@ -119,7 +119,7 @@ class Bablotron extends BitBase
     */
     function find_similar_words($word, $threshold)
     {
-        $similar = array();
+        $similar = [];
         $tbl = 'babl_words_' . $this->lan;
         $word = addslashes( ( trim( $word ) ) );
         $sndx = substr($word, 0, 2);
diff --git a/LibertyTranslations.php b/includes/classes/LibertyTranslations.php
index da53fc7..0527b9b 100644..100755
--- a/LibertyTranslations.php
+++ b/includes/classes/LibertyTranslations.php
@@ -6,21 +6,25 @@
  * @author ?
  */
 
-/**
+namespace Bitweaver\Languages;
+use Bitweaver\BitBase;
+use Bitweaver\Liberty\LibertyBase;
+
+ /**
  * @package languages
  */
  class LibertyTranslations extends LibertyBase {
-	function __construct( $pContentId = NULL ) {
+	public function __construct( $pContentId = null ) {
 		$this->mContentId = $pContentId;
 		parent::__construct();
 	}
 
-	function getContentTranslations() {
+	public function getContentTranslations() {
 		global $gBitSystem, $gBitLanguage;
-		$ret = array();
-		if( @BitBase::verifyId( $this->mContentId ) ) {
+		$ret = [];
+		if( BitBase::verifyId( $this->mContentId ) ) {
 			$translationId = $this->mDb->getOne( "SELECT `translation_id` FROM `".BIT_DB_PREFIX."i18n_content_trans_map` WHERE `content_id`=?", array( $this->mContentId ) );
-			if( @BitBase::verifyId( $translationId ) ) {
+			if( BitBase::verifyId( $translationId ) ) {
 				$query = "SELECT lc.`content_id`, lc.`title`, lc.`lang_code`, ictm.`translation_id`
 					FROM `".BIT_DB_PREFIX."i18n_content_trans_map` ictm
 						INNER JOIN `".BIT_DB_PREFIX."liberty_content` lc ON( lc.`content_id`=ictm.`content_id` )
@@ -38,10 +42,10 @@
 		return $ret;
 	}
 
-	function storeTranslation( $pParamHash ) {
+	public function storeTranslation( $pParamHash ) {
 		if( $this->verify( $pParamHash ) ) {
 			$table = BIT_DB_PREFIX."i18n_content_trans_map";
-			if( !@BitBase::verifyId( $pParamHash['translation_store']['translation_id'] ) && is_array( $pParamHash['translation_store'] ) ) {
+			if( !BitBase::verifyId( $pParamHash['translation_store']['translation_id'] ?? 0 ) && is_array( $pParamHash['translation_store'] ) ) {
 				foreach( $pParamHash['translation_store'] as $store ) {
 					$result = $this->mDb->associateInsert( $table, $store );
 				}
@@ -51,11 +55,11 @@
 		}
 	}
 
-	function verify( &$pParamHash ) {
+	public function verify( array &$pParamHash ): bool {
 		$i = 0;
 
 		// make sure we don't have a translation_id for this content yet
-		if( @BitBase::verifyId( $pParamHash['from_id'] ) ) {
+		if( BitBase::verifyId( $pParamHash['from_id'] ?? 0 ) ) {
 			$pParamHash['translation_id'] = $this->mDb->getOne( "SELECT `translation_id` FROM `".BIT_DB_PREFIX."i18n_content_trans_map` WHERE `content_id`=?", array( $pParamHash['from_id'] ) );
 		}
 
@@ -63,10 +67,10 @@
 		// in theory, this shouldn't happen, but there might be a situation where we end up with 2 users translating the same page at the same time. (is this true?)
 
 		// if we have a translation_id, we add this content to the same group of translations
-		if( @BitBase::verifyId( $pParamHash['translation_id'] ) ) {
+		if( BitBase::verifyId( $pParamHash['translation_id'] ?? 0 ) ) {
 			$pParamHash['translation_store']['translation_id']     = $pParamHash['translation_id'];
 			$pParamHash['translation_store']['content_id']         = $pParamHash['content_id'];
-		} elseif( @BitBase::verifyId( $pParamHash['from_id'] ) ) {
+		} elseif( BitBase::verifyId( $pParamHash['from_id'] ?? 0 ) ) {
 			// we have a from_id but no translation_id, this is a new entry in the translation map and we need both, the original and the new content_id entered
 			// we can simply use the from_id as the translation_id
 			$pParamHash['translation_store'][$i]['translation_id'] = $pParamHash['from_id'];
@@ -75,13 +79,14 @@
 			$pParamHash['translation_store'][$i]['translation_id'] = $pParamHash['from_id'];
 			$pParamHash['translation_store'][$i]['content_id']     = $pParamHash['content_id'];
 		}
-		return( count( $this->mErrors ) == 0 );
+		return count( $this->mErrors ) == 0;
 	}
 
-	function expunge() {
-		if( @BitBase::verifyId( $this->mContentId ) ) {
+	public function expunge(): bool {
+		if( BitBase::verifyId( $this->mContentId ) ) {
 			$result = $this->mDb->query( "DELETE FROM `".BIT_DB_PREFIX."i18n_content_trans_map` WHERE `content_id`=?", $this->mContentId );
 		}
+		return true;
 	}
 }
 
@@ -103,7 +108,7 @@ function translation_content_display( &$pObject ) {
 function translation_content_edit( &$pObject, &$pParamHash ) {
 	global $gBitLanguage, $gBitSmarty, $gBitUser;
 	$trans = new LibertyTranslations( $pObject->mContentId );
-	$translationId = NULL;
+	$translationId = null;
 	$translations = $trans->getContentTranslations();
 	foreach( $gBitLanguage->mLanguageList as $lang_code => $language ) {
 		$translationsList[$lang_code] = $language;
@@ -116,10 +121,10 @@ function translation_content_edit( &$pObject, &$pParamHash ) {
 	$gBitSmarty->assign( 'translationsList', $translationsList );
 	$gBitSmarty->assign( 'translationId', $translationId );
 
-	if( @BitBase::verifyId( $_REQUEST['i18n']['from_id'] ) ) {
+	if( BitBase::verifyId( $_REQUEST['i18n']['from_id'] ?? 0 ) ) {
 		// load the content we're translating from
 		$transObject = LibertyBase::getLibertyObject( $_REQUEST['i18n']['from_id'] );
-		$gBitSmarty->assignByRef( "translateFrom", $transObject );
+		$gBitSmarty->assign( "translateFrom", $transObject );
 
 		// attempt google translation
 		if( !empty( $_REQUEST['i18n']['google'] ) && !empty( $transObject->mInfo['data'] )) {
@@ -152,7 +157,7 @@ die;
 function translation_content_store( $pObject, $pParamHash ) {
 	// if we are creating this content and we have a from_id, we know that we're translating a page
 	// mInfo['content_id'] isn't set when content is created
-	if( empty( $pObject->mInfo['content_id'] ) && @BitBase::verifyId( $_REQUEST['i18n']['from_id'] ) ) {
+    if( empty( $pObject->mInfo['content_id'] ) && BitBase::verifyId( $_REQUEST['i18n']['from_id'] ?? 0 ) ) {
 		$trans = new LibertyTranslations();
 		$storeHash = $_REQUEST['i18n'];
 		$storeHash['content_id'] = $pParamHash['content_id'];
@@ -162,8 +167,7 @@ function translation_content_store( $pObject, $pParamHash ) {
 	}
 }
 
-function translation_content_exunge( $pObject, $pParamHash ) {
+function translation_content_expunge( $pObject, $pParamHash ) {
 	$trans = new LibertyTranslations( $pObject->mContentId );
 	$trans->expunge();
-}
-?>
+}
\ No newline at end of file