Changeset 4707

Timestamp:

08/05/07 16:33:46 (6 years ago)

Author:

p_lindheimer

Message:

#2216, #1826 fix languages (overall language arch needs improvement); add access='all' attribute to menu items to force their accessibility to all users despite database mode access, fix some undefined vars, removed old commented out welcome page text and module functions

Files:

• freepbx/branches/2.3/amp_conf/htdocs/admin/config.php (modified) (6 diffs)
• freepbx/branches/2.3/amp_conf/htdocs/admin/functions.inc.php (modified) (3 diffs)
• freepbx/branches/2.3/amp_conf/htdocs/admin/header.php (modified) (2 diffs)

freepbx/branches/2.3/amp_conf/htdocs/admin/config.php

@@ -124 +124 @@
-    }
-    
-    
-    // if the module has it's own translations, use them for displaying menu item
-    if (extension_loaded('gettext')) {
-      if (is_dir("modules/{$key}/i18n")) {
-        bindtextdomain($key,"modules/{$key}/i18n");
-        bind_textdomain_codeset($key, 'utf8');
-        textdomain($key);
-      } else {
-        bindtextdomain('amp','./i18n');
-        textdomain('amp');
-      }
-    }
-    
-    //create an array of module sections to display
-    // stored as [items][$type][$category][$name] = $displayvalue
@@ -143 +130 @@
-      foreach($module['items'] as $itemKey => $item) {
-
-
-
-
-
-
+
+
+
+
+
+
-        }
-
@@ -246 +234 @@
-
-ob_start();
+
+$module_name = "";
+$module_page = "";
+$module_file = "";
-
-// show the appropriate page
@@ -285 +277 @@
-      break; // we break here to avoid the generateconfigpage() below
-    } else if (file_exists($module_file)) {
+      // load language info if available
+      if (extension_loaded('gettext')) {
+        if (is_dir("modules/{$module_name}/i18n")) {
+          bindtextdomain($module_name,"modules/{$module_name}/i18n");
+          bind_textdomain_codeset($module_name, 'utf8');
+          textdomain($module_name);
+        }
+      }
-      include($module_file);
-    } else {
@@ -306 +306 @@
-  case '':
-    if ($astman) {
-/*
-      printf( "<h2>%s</h2>", dgettext("welcome page", "Welcome to FreePBX.") );
-
-      $modules_needup = module_getinfo(false, MODULE_STATUS_NEEDUPGRADE);
-      $modules_broken = module_getinfo(false, MODULE_STATUS_BROKEN);
-      if (count($modules_needup) || count($modules_broken)) {
-        echo "<div class=\"warning\">";
-        if (count($modules_needup)) {
-          echo "<p>"._("Warning: The following modules are disabled because they need upgrading: ");
-          echo implode(", ",array_keys($modules_needup));
-          echo "</p>";
-        }
-        if (count($modules_broken)) {
-          echo "<p>"._("Warning: The following modules are disabled because they are broken: ");
-          echo implode(", ",array_keys($modules_broken));
-          echo "</p>";
-        }
-        echo "<p>", sprintf(dgettext("welcome page","You should go to the <a href='%s'>Module Admin</a> page to fix these.</p>"), "config.php?display=modules&amp;type=tool");
-        echo "</div>";
-      }
-      
-// BETA code - remove later.
-      echo "<div class=\"warning\">";
-      printf( "<p>%s</p>", dgettext("welcome page", "You are FreePBX 2.3 Beta 1. This release is the first release in prepartation for FreePBX Version 2.3.0.") );
-      
-      printf( "<p>%s</p>"  , dgettext("welcome page", "Currently known bugs are maintained on <a href='http://www.freepbx.org/trac/wiki/2.3Beta'>this TRAC page</a>. If you find a bug, please <a href='http://www.freepbx.org/trac/newticket'>create a bug report</a> (you need to create an account - this is to avoid spammers) and the bug report will immediately appear on the <a href='http://www.freepbx.org/trac/wiki/2.3Beta'>TRAC page</a> so that it can be easily tracked by other users.") );
-      echo "</div>";
-
-      printf( "<!--[if IE]><p>%s</p><![endif]-->"  , dgettext("welcome page", "Note, presently, Microsoft's Internet Explorer is <b>not</b> a supported web browser, and you must use a standards compliant browser, such as Firefox.") );
-      
-      if ($amp_conf['AMPMGRPASS'] == 'amp111') {
-        printf( "<div class=\"warning\"><p>%s</p></div>", dgettext("welcome text", "Warning: You are running FreePBX and ").$amp_conf['AMPENGINE'].dgettext("welcome page", " with the default manager pass. You should consider changing this to something else.")." ".sprintf('(<a href="http://aussievoip.com/wiki/index.php?page=FreePBX-ManagerPass" target="_new">%s</a>)', _("Help")) );
-      }
-      
-      if ( ($amp_conf["AMPDBENGINE"] == "mysql") || ($amp_conf["AMPDBENGINE"] == "pgsql")) {
-        if  ($amp_conf['AMPDBPASS'] == 'amp109') {
-          printf( "<div class=\"warning\"><p>%s</p></div>", dgettext("welcome text", "Warning: You are running FreePBX and ").$amp_conf['AMPDBENGINE'].dgettext("welcome page", " with the default password ")." ".sprintf('(<a href="http://aussievoip.com/wiki/index.php?page=FreePBX-MysqlPass" target="_new">%s</a>)', _("Help")) );
-        }
-      }
-
-
-
-      printf( "<p>%s</p>"  , dgettext("welcome page", "If you're new to FreePBX, Welcome. Here are some quick instructions to get you started") );
-      
-      echo "<p>";
-      printf( dgettext("welcome page", 
-"There are a large number of Plug-in modules available from the Online Repository. This is
-available by clicking on the <a href='%s'>Tools menu</a> up the top, then
-<a href='%s'>Module Admin</a>, then
-<a href='%s'>Check for updates online</a>.
-Modules are updated and patched often, so if you are having a problem, it's worth checking there to see if there's
-a new version of the module available."), 
-        "config.php?type=tool",
-        "config.php?display=modules&amp;type=tool",
-        "config.php?display=modules&amp;type=tool&amp;extdisplay=online"
-      );
-      echo "</p>\n";
-
-      echo "<p>";
-      printf( dgettext( "welcome page",
-"If you're having any problems, you can also use the <a href='%s'>Online Support</a> 
-module (<b>you need to install this through the <a href='%s'>Module Repository</a> first</b>)
-to talk to other users and the devlopers in real time. Click on <a href='%s'>Start IRC</a>,
-when the module is installed, to start a Java IRC client." ),
-        "config.php?type=tool&amp;display=irc",
-        "config.php?display=modules&amp;type=tool&amp;extdisplay=online",
-        "config.php?type=tool&amp;display=irc&amp;action=start"
-      );
-      echo "</p>\n";
-
-      echo "<p>";
-      printf( dgettext( "welcome page",
-"There is also a community based <a href='%s' target='_new'>FreePBX Web Forum</a> where you can post
-questions and search for answers for any problems you may be having."),
-"http://forums.freepbx.org"  );
-      echo "</p>\n";
-
-      print( "<p>" . _("We hope you enjoy using FreePBX!") . "</p>\n" );
-    } // no manager, no connection to asterisk
-    else {
-      echo "<p><div class='clsError'>\n";
-      echo "<b>" . _("Warning:") . "</b>\n";
-      echo "<br>";
-      echo "<br>\n";
-      echo _("Cannot connect to Asterisk Manager with "). "<i>" .$amp_conf["AMPMGRUSER"] . "</i>";
-      echo "<br>";
-      echo _("Asterisk may not be running.");
-      echo "</div></p>\n";
-*/
-      showview('welcome', array('AMP_CONF' => &$amp_conf));
-    } else {
@@ -419 +330 @@
-  $admin_template['display'] = $display;
-
+  // set the language so local module languages take
+  set_language();
+
-  // then load it and put it into the main freepbx interface
-  $template['content'] = loadview('freepbx_admin', $admin_template);

freepbx/branches/2.3/amp_conf/htdocs/admin/functions.inc.php

@@ -1626 +1626 @@
-
-
-
-/*
-// just for testing hooks, i'll delete it later
-function queues_hook_core($viewing_itemid, $target_menuid) {
-  switch ($target_menuid) {
-    case 'did':
-      //get the current setting for this display (if any)
-      $alertinfo = $viewing_itemid;
-          return '
-        <tr>
-          <td><a href="#" class="info">'._("Alert Info").'<span>'._('ALERT_INFO can be used for distinctive ring with SIP devices.').'</span></a>:</td>
-          <td><input type="text" name="alertinfo" size="10" value="'.(($alertinfo) ? $alertinfo : "") .'"></td>
-        </tr>
-      ';
-    break;
-    default:
-      return false;
-    break;
-  }
-}
-
-function queues_hookProcess_core($viewing_itemid, $request) {
-  switch ($request['action']) {
-    case 'edtIncoming':
-      echo "<h1>HI</h1>";
-          return '
-        <tr>
-          <td><a href="#" class="info">'._("Alert Info").'<span>'._('ALERT_INFO can be used for distinctive ring with SIP devices.').'</span></a>:</td>
-          <td><input type="text" name="alertinfo" size="10" value="'.(($alertinfo) ? $alertinfo : "") .'"></td>
-        </tr>
-      ';
-    break;
-    default:
-      return false;
-    break;
-  }
-}
-*/
-
-/** Replaces variables in a string with the values from ampconf
- * eg, "%AMPWEBROOT%/admin" => "/var/www/html/admin"
@@ -2694 +2655 @@
-            'needsenginedb', // set to true if engine db access required (e.g. astman access)
-            'needsenginerunning', // set to true if required to run
+            'access', // set to all if all users should always have access
-          );
-          foreach ($optional_attribs as $attrib) {
@@ -2963 +2925 @@
-  }
-} 
-
-
-/*
-function installModule($modname,$modversion) 
-{
-  global $db;
-  global $amp_conf;
-  
-  switch ($amp_conf["AMPDBENGINE"])
-  {
-    case "sqlite":
-      // to support sqlite2, we are not using autoincrement. we need to find the 
-      // max ID available, and then insert it
-      $sql = "SELECT max(id) FROM modules;";
-      $results = $db->getRow($sql);
-      $new_id = $results[0];
-      $new_id ++;
-      $sql = "INSERT INTO modules (id,modulename, version,enabled) values ('{$new_id}','{$modname}','{$modversion}','0' );";
-      break;
-    
-    default:
-      $sql = "INSERT INTO modules (modulename, version) values ('{$modname}','{$modversion}');";
-    break;
-  }
-
-  $results = $db->query($sql);
-  if(DB::IsError($results)) {
-    die($results->getMessage());
-  }
-}
-
-function uninstallModule($modname) {
-  global $db;
-  $sql = "DELETE FROM modules WHERE modulename = '{$modname}'";
-  $results = $db->query($sql);
-  if(DB::IsError($results)) {
-    die($results->getMessage());
-  }
-}
-
-/** downloads a module, and extracts it into the module dir
- * /
-function module_fetch($name) { // was fetchModule
-  global $amp_conf;
-  $res = module_getonlinexml($modulename);
-  if (!isset($res)) {
-    echo "<div class=\"error\">"._("Unaware of module")." {$name}</div>";
-    return false;
-  }
-  $file = basename($res['location']);
-  $filename = $amp_conf['AMPWEBROOT']."/admin/modules/_cache/".$file;
-  if(file_exists($filename)) {
-    // We might already have it! Let's check the MD5.
-    $filedata = "";
-    $fh = @fopen($filename, "r");
-    while (!feof($fh)) {
-      $filedata .= fread($fh, 8192);
-    }
-    if (isset($res['md5sum']) && $res['md5sum'] == md5 ($filedata)) {
-      // Note, if there's no MD5 information, it will redownload
-      // every time. Otherwise theres no way to avoid a corrupt
-      // download
-      
-      return verifyAndInstall($filename);
-    } else {
-      unlink($filename);
-    }
-  }
-
-  $url = "http://mirror.freepbx.org/modules/".$res['location'];
-
-  $fp = @fopen($filename,"w");
-  $filedata = file_get_contents($url);
-  fwrite($fp,$filedata);
-  fclose($fp);
-  if (is_readable($filename) !== TRUE ) {
-    echo "<div class=\"error\">"._("Unable to save")." {$filename} - Check file/directory permissions</div>";
-    return false;
-  }
-  // Check the MD5 info against what's in the module's XML
-  if (!isset($res['md5sum']) || empty($res['md5sum'])) {
-    echo "<div class=\"error\">"._("Unable to Locate Integrity information for")." {$filename} - "._("Continuing Anyway")."</div>";
-  } elseif ($res['md5sum'] != md5 ($filedata)) {
-    echo "<div class=\"error\">"._("File Integrity FAILED for")." {$filename} - "._("Aborting")."</div>";
-    unlink($filename);
-    return false;
-  }
-  // verifyAndInstall does the untar, and will do the signed-package check.
-  return verifyAndInstall($filename);
-
-}
-
-function upgradeModule($module, $allmods = NULL) {
-  if($allmods === NULL)
-    $allmods = find_allmodules();
-  // the install.php can set this to false if the upgrade fails.
-  $success = true;
-  if(is_file("modules/$module/install.php"))
-    include "modules/$module/install.php";
-  if ($success) {
-    sql('UPDATE modules SET version = "'.$allmods[$module]['version'].'" WHERE modulename = "'.$module.'"');
-    needreload();
-  }
-}
-
-function rmModule($module) {
-  global $amp_conf;
-  if($module != 'core') {
-    if (is_dir($amp_conf['AMPWEBROOT'].'/admin/modules/'.$module) && strstr($module, '.') === FALSE ) {
-      exec('/bin/rm -rf '.$amp_conf['AMPWEBROOT'].'/admin/modules/'.$module);
-    }
-  } else {
-    echo "<script language=\"Javascript\">alert('"._("You cannot delete the Core module")."');</script>";
-  }
-}
-
-*/
-
-function module_run_notification_checks() {

freepbx/branches/2.3/amp_conf/htdocs/admin/header.php

@@ -68 +68 @@
-
-// setup locale
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-  }
-  bindtextdomain('amp','./i18n');
-  bind_textdomain_codeset('amp', 'utf8');
-  textdomain('amp');
-}
+set_language();
-
-
@@ -105 +108 @@
-// get settings
-$amp_conf = parse_amportal_conf("/etc/amportal.conf");
-rtrim($amp_conf["ASTETCDIR"],"/")
+$amp_conf["ASTETCDIR"]
-$astman   = new AGI_AsteriskManager();
-