Changeset 8694 for modules/branches

Timestamp:

01/27/10 13:10:27 (3 years ago)

Author:

p_lindheimer

Message:

remove langagues 2.6.0.1 published in error should only be in 2.7 re #4004

Files:

• modules/branches/2.6/languages (modified) (1 prop)
• modules/branches/2.6/languages/functions.inc.php (modified) (3 diffs)
• modules/branches/2.6/languages/install.php (modified) (2 diffs)
• modules/branches/2.6/languages/module.xml (modified) (3 diffs)
• modules/branches/2.6/languages/uninstall.php (modified) (1 diff)

modules/branches/2.6/languages/functions.inc.php

@@ -50 +50 @@
-          $ext->add('app-languages',$row['language_id'], '', new ext_goto($row['dest']));
-      }
-    
-    break;
-  }
@@ -66 +65 @@
-        $ext->splice('macro-user-callerid', 's', $priority,new ext_execif('$["${DB(AMPUSER/${AMPUSER}/language)}" != ""]', 'Set', 'LANGUAGE()=${DB(AMPUSER/${AMPUSER}/language)}'));
-      }
-      
-      $engine_info = engine_getinfo();
-      $version = $engine_info['version'];     
-      $routes=lanugage_incoming_get();
-      foreach($routes as $current => $route){
-        if($route['extension']=='' && $route['cidnum']){//callerID only
-          $extension='s/'.$route['cidnum'];
-          $context=$route['pricid']?'ext-did-0001':'ext-did-0002';
-        }else{
-          if(($route['extension'] && $route['cidnum'])||($route['extension']=='' && $route['cidnum']=='')){//callerid+did / any/any
-            $context='ext-did-0001';
-          }else{//did only
-            $context='ext-did-0002';
-          }
-          $extension=($route['extension']!=''?$route['extension']:'s').($route['cidnum']==''?'':'/'.$route['cidnum']);
-        }
-        if(version_compare($version, "1.4", "ge")){ 
-          $ext->splice($context, $extension, 1, new ext_setvar('CHANNEL(language)',$route['language']));
-        }else{
-          $ext->splice($context, $extension, 1, new ext_setvar('LANGUAGE',$route['language']));
-        }
-    }
-    break;
-  }
@@ -243 +220 @@
-}
-
-  //inbound route langauge settings
-function languages_hook_core($viewing_itemid, $target_menuid){
-  //if were editing, get save parms
-  if(isset($_REQUEST['pricid']) && $_REQUEST['pricid'] == 'CHECKED'){$pricid=true;}else{$pricid=false;}
-  if(!isset($_REQUEST['extension']) && !isset($_REQUEST['cidnum'])){//set $extension,$cidnum if we dont already have them
-    $opts=explode('/', $_REQUEST['extdisplay']);$extension=$opts['0'];$cidnum=$opts['1'];
-  }else{
-    $extension=$_REQUEST['extension'];$cidnum=$_REQUEST['cidnum'];
-  }
-  if((isset($_REQUEST['action']) && $_REQUEST['action'] == 'edtIncoming') || ( isset($extension) || isset($cidnum )) && isset($_REQUEST['language']) ){
-    laguages_incoming_update($language=$_REQUEST['language'],$extension,$cidnum,$pricid);
-  }
-  if(isset($_REQUEST['action']) && $_REQUEST['action']=='delIncoming'){
-    laguages_incoming_delete($extension,$cidnum);
-  }
-  $html = '';
-  if ($target_menuid == 'did'){
-    $html.='<tr><td colspan="2"><h5>'._("Language").'<hr></h5></td></tr>';
-    $html.='<tr><td><a href="#" class="info">'._('Langauge').'<span>'._("Allowes you to set the language for this DID.").'</span></a>:</td>';
-    $html.='<td><input type="text" name="language" value="'.lanugage_incoming_get($extension,$cidnum).'"></td></tr>';
-  }
-  return $html;
-}
-
-function lanugage_incoming_get($extension=null,$cidnum=null){
-  global $db;
-  if($extension || $cidnum || $_REQUEST['extdisplay']=='/' || $_REQUEST['display']=='did'){
-    $sql='SELECT language FROM language_incoming WHERE extension = ? AND cidnum = ?';
-    $lang=$db->getOne($sql, array($extension, $cidnum));
-  }else{
-    $sql="SELECT * FROM language_incoming";
-    $lang=$db->getAll($sql, DB_FETCHMODE_ASSOC);
-  }
-  return $lang;
-}
-
-function laguages_incoming_update($language=null,$extension=null,$cidnum=null,$pricid){
-  global $db;
-  $sql='DELETE FROM language_incoming WHERE extension = ? AND cidnum = ?';
-  $db->query($sql,array($extension,$cidnum));
-  if(isset($language) && $language!=''){//no need to keep a record if were not setting the language
-    $sql='INSERT INTO language_incoming (extension,cidnum,language,pricid) VALUES (?, ?, ?, ?)';
-    $db->query($sql,array($extension,$cidnum,$language,$pricid));
-  }
-}
-
-function laguages_incoming_delete($extension=null,$cidnum=null){
-  global $db;
-  $sql='DELETE FROM language_incoming WHERE extension = ? AND cidnum = ?';
-  $foo=$db->query($sql,array($extension,$cidnum));
-}
-
-function languages_check_destinations($dest=true) {
-  global $active_modules;

modules/branches/2.6/languages/install.php

@@ -4 +4 @@
-
-$autoincrement = (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3")) ? "AUTOINCREMENT":"AUTO_INCREMENT";
-[]=
+ = 
-  language_id INTEGER NOT NULL PRIMARY KEY $autoincrement,
-  lang_code VARCHAR( 50 ) ,
@@ -10 +10 @@
-  dest VARCHAR( 255 )
-)";
-$sql[]='CREATE TABLE IF NOT EXISTS language_incoming (
-      extension varchar(50),
-      cidnum varchar(50),
-      pricid varchar(25),
-      language varchar(10)
-      );';
-
-
-
-
-
-
+
+
+
-}
-

modules/branches/2.6/languages/module.xml

@@ -2 +2 @@
-  <rawname>languages</rawname>
-  <name>Languages</name>
-1
+0
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -14 +14 @@
-  </menuitems>
-  <changelog>
-    *2.6.0.1* #4004 inbound routes should have option to set language
-    *2.6.0.0* localizations, misc
-    *2.5.0.6* localization, Swedish
@@ -31 +30 @@
-    <version>2.5.0alpha1</version>
-  </depends>
-1
-9143a5577c0c54fdb1329ff8c36ef797
+0
+4b4487ddc31fb9f5bffbb137ca19c6b8
-</module>

modules/branches/2.6/languages/uninstall.php

@@ -7 +7 @@
-echo "done<br>\n";
-
-echo "dropping table language_incoming..";
-sql("DROP TABLE IF EXISTS `language_incoming`");
-echo "done<br>\n";
-
-
-?>