[1702] removed further references to chat (config)

heri · Aug 22, 2012 · d1c7ebc · d1c7ebc
1 parent f3fd56a
commit d1c7ebc
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 23 deletions.
diff --git a/htdocs/bw/layout/menus.php b/htdocs/bw/layout/menus.php
@@ -146,7 +146,6 @@ function Menu2_old($link = "", $tt = "") {
                         <li><a href="/trip"><?=ww('Trips')?></a></li>
                         <li><a href="/gallery"><?=ww('Gallery')?></a></li>
                         <li><a href="/blog"><?=ww('Blogs')?></a></li>
-                        <li><a href="/chat"><?=ww('Chat')?></a></li>
                     </ul>
                 </li>
                 <li><a href="/about"><?=ww('GetAnswers')?></a>

diff --git a/inc/config.inc.php.example b/inc/config.inc.php.example
@@ -38,13 +38,6 @@ $google['maps_api_key'] = 'ABQIAAAARaC_q9WJHfFkobcvibZvUBT2yXp_ZAY8_ufC3CFXhHIE1
 // The URL to the geoname webservice (this default is probably ok for you)
 $google['geonames_webservice'] = 'http://ws.geonames.org/search?q={query}&maxRows={rows}&style=LONG';
 
-
-// Chat settings (optional)
-$chat = array();
-// $chat['host'] = 'your.chat.domain';
-// $chat['port'] = 6667;
-// $chat['channel'] = '#mytravelbook';
-
 //*******************************************************
 // PLEASE DO NOT EDIT BEYOND THIS LINE
 //*******************************************************
@@ -59,8 +52,6 @@ PVars::register('config_request', $request);
 unset($request);
 PVars::register('config_google', $google);
 unset($google);
-PVars::register('config_chat', $chat);
-unset($chat);
 PVars::register('env', $env);
 define('SESSION_NAME', $env['session_name']);
 unset($env);
@@ -133,4 +124,4 @@ $_SYSHCVOL['WhoIsOnlineDelayInMinutes'] = 10; // The delay of non activity to co
 $_SYSHCVOL['WhoIsOnlineLimit'] = 11; // This limit the number of whoisonline, causing the display of ww('MaxOnlineNumberExceeded') at login for new loggers 
 $_SYSHCVOL['EncKey'] = "YEU76EY6"; // encryption key 
 
-?>
+?>
diff --git a/rox_default.ini b/rox_default.ini
@@ -51,12 +51,6 @@ api = ""
 ; the tempfolder - on windows computers this needs to be something like "c:\temp\" or on linux "/home/bwrox/tmp/
 tmpfolder = "/tmp"
 
-; Chat settings (optional)
-; [chat]
-; host = 'your.chat.domain';
-; port = 6667;
-; channel = '#mytravelbook';
-
 [messages]
 ; New members' sending limits
 new_members_messages_per_hour = 10

diff --git a/roxlauncher/environmentexplorer.php b/roxlauncher/environmentexplorer.php
@@ -352,7 +352,6 @@ private function _initPVars($settings)
             'config_mailAddresses' => 'mailAddresses',
             'config_request' => 'request',
             'config_google' => 'google',
-            'config_chat' => 'chat',
             'env' => 'env'
         ) as $key_in_pvars => $key_in_inifile) {
             $keymap[$key_in_pvars] = $key_in_inifile;

diff --git a/roxlauncher/roxloader.php b/roxlauncher/roxloader.php
@@ -93,7 +93,6 @@ public static function create_ini_file()
                 'mailAddresses' => 'config_mailAddresses',
                 'request' => 'config_request',
                 'google' => 'config_google',
-                'chat' => 'config_chat',
                 'env' => 'env'
             ) as $section => $objectname) {
                 if(

diff --git a/roxlauncher/roxlocalsettingsimporter.php b/roxlauncher/roxlocalsettingsimporter.php
@@ -52,7 +52,6 @@ public function importConfigPHP($default_settings)
                 'mailAddresses' => 'config_mailAddresses',
                 'request' => 'config_request',
                 'google' => 'config_google',
-                'chat' => 'config_chat',
                 'env' => 'env'
             ) as $sectionname => $objectname) {
                 $differences[$sectionname] = array();

diff --git a/text/de/apps/mytravelbook/topmenu.php b/text/de/apps/mytravelbook/topmenu.php
@@ -17,8 +17,7 @@
     'country'   => 'Länder',
     'forums'   => 'Foren',
     'wiki'		=> 'Wiki',
-    'chat'		=> 'Chat',
     'help'   => 'Hilfe',
     'about'     => 'About'
 );
-?>
+?>
diff --git a/text/en/apps/mytravelbook/topmenu.php b/text/en/apps/mytravelbook/topmenu.php
@@ -17,7 +17,6 @@
     'country'   => 'Countries',
     'forums'   => 'Forums',
     'wiki'		=> 'Wiki',
-    'chat'		=> 'Chat',
     'help'   => 'Help',
     'about'     => 'About'
 );