Changeset 1934

Timestamp:

05/18/06 07:36:44 (7 years ago)

Author:

qldrob

Message:

Update to manager 1.0.2 - Thanks _xo_!

Files:

• modules/branches/2.1/manager/functions.inc.php (modified) (1 diff)
• modules/branches/2.1/manager/i18n/fr_FR/LC_MESSAGES/manager.mo (modified) (previous)
• modules/branches/2.1/manager/i18n/fr_FR/LC_MESSAGES/manager.po (modified) (5 diffs)
• modules/branches/2.1/manager/module.xml (modified) (2 diffs)
• modules/branches/2.1/manager/page.manager.php (modified) (6 diffs)
• modules/branches/2.1/manager/uninstall.sql (deleted)

modules/branches/2.1/manager/functions.inc.php

@@ -50 +50 @@
-}
-
+// Used to set the correct values for the html checkboxes
+function manager_format_out($p_tab) {
+  $res['name'] = $p_tab['name'];
+  $res['secret'] = $p_tab['secret'];
+  $res['deny'] = $p_tab['deny'];
+  $res['permit'] = $p_tab['permit'];
+
+  $tmp = explode(',', $p_tab['read']);
+  foreach($tmp as $item) {
+    $res['r'.$item] = true;
+  }
+
+  $tmp = explode(',', $p_tab['write']);
+  foreach($tmp as $item) {
+    $res['w'.$item] = true;
+  }
+
+  return $res;
+}
+
-// Delete a manager
-function manager_del($p_name) {
-  $results = sql("DELETE FROM manager WHERE name = \"$p_name\"","query");
+}
+
+function manager_format_in($p_tab) {
+  if (isset($p_tab['rsystem']))
+    $res['read'] .= "system,";
+  if (isset($p_tab['rcall']))
+    $res['read'] .= "call,";
+  if (isset($p_tab['rlog']))
+    $res['read'] .= "log,";
+  if (isset($p_tab['rverbose']))
+    $res['read'] .= "verbose,";
+  if (isset($p_tab['rcommand']))
+    $res['read'] .= "command,";
+  if (isset($p_tab['ragent']))
+    $res['read'] .= "agent,";
+  if (isset($p_tab['ruser']))
+    $res['read'] .= "user";
+
+  if (isset($p_tab['wsystem']))
+    $res['write'] .= "system,";
+  if (isset($p_tab['wcall']))
+    $res['write'] .= "call,";
+  if (isset($p_tab['wlog']))
+    $res['write'] .= "log,";
+  if (isset($p_tab['wverbose']))
+    $res['write'] .= "verbose,";
+  if (isset($p_tab['wcommand']))
+    $res['write'] .= "command,";
+  if (isset($p_tab['wagent']))
+    $res['write'] .= "agent,";
+  if (isset($p_tab['wuser']))
+    $res['write'] .= "user";
+  
+  return $res;
-}
-

modules/branches/2.1/manager/i18n/fr_FR/LC_MESSAGES/manager.po

@@ -2 +2 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-FIRST AUTHOR <EMAIL@ADDRESS>, YEAR
+Xavier Ourcière <xourciere@propolys.com>, 2006
-#
-#, fuzzy
@@ -9 +9 @@
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-4-28 18:30
+5-04 20:03
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-FULL NAME <EMAIL@ADDRESS
+Xavier Ourcière <xourciere@propolys.com
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
@@ -19 +19 @@
-#: functions.inc.php:29
-msgid "Error writing the manager additional file."
-e
+é
-
-63
+117
-msgid "This manager already exists"
-eja
+éjà
-
-7 page.manager.php:78 page.manager.php:85
+9 page.manager.php:80 page.manager.php:87
-msgid "Add Manager"
-msgstr "Ajout Manager"
-
-1
+3
-msgid "Manager"
-msgstr ""
-
-1
+3
-msgid "deleted"
-msgstr "supprimé"
-
-5
+7
-msgid "Manager:"
-msgstr ""
-
-6
+8
-msgid "Delete Manager"
-msgstr "Supprimer le Manager"
-
-5
+7
-msgid "Edit Manager"
-msgstr "Edition Manager"
-
-7
+9
-msgid "manager name:"
-msgstr "nom du manager:"
-
-7
+9
-msgid "Name of the manager without space."
-msgstr "Nom du manager sans espace."
-
-1
+3
-msgid "manager secret:"
-msgstr "mot de passe:"
-
-1
+3
-msgid "Password for the manager."
-msgstr "Mot de passe du manager."
-
-5
+7
-msgid "deny:"
-msgstr ""
-
-5
+7
-msgid ""
-"If you want to deny many hosts or networks, use & char as separator.<br/><br/"
@@ -78 +78 @@
-"0.0.0"
-
-99
+101
-msgid "permit:"
-msgstr ""
-
-99
+101
-msgid ""
-"If you want to permit many hosts or networks, use & char as separator. Look "
@@ -90 +90 @@
-" & comme séparateur."
-
-3
-read:
-
+5
+Rights
+Droits d'acces
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+

modules/branches/2.1/manager/module.xml

@@ -2 +2 @@
-  <rawname>manager</rawname>
-  <name>Asterisk API</name>
-1
+2
-  <type>tool</type>
-  <category>Basic</category>
@@ -8 +8 @@
-    <manager>Asterisk API</manager>
-  </menuitems>
-release/manager-1.0.1.tgz
+xx
-  <info>http://aussievoip.com.au/wiki/freePBX-ManagerAPI</info>
-358dc62725a89cb08fab0175ba5c4814
+xx
-</module>

modules/branches/2.1/manager/page.manager.php

@@ -21 +21 @@
-switch ($action) {
-  case "add":
-
+
+
-    manager_gen_conf();
-    needreload();
@@ -32 +33 @@
-  case "edit":  //just delete and re-add
-    manager_del($_REQUEST['name']);
-
+
+
-    manager_gen_conf();
-    needreload();
@@ -65 +67 @@
-    $thisManager = manager_get($managerdisplay);
-    //create variables
-$thisManager
+manager_format_out($thisManager)
-  }
-
@@ -101 +103 @@
-  </tr>
-  <tr>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </tr>
-               
@@ -120 +163 @@
-
-theForm.name.focus();
+
+function writeCheck() {
+  if (theForm.wallnone.checked) {
+    theForm.wsystem.checked = true;
+    theForm.wcall.checked = true;
+    theForm.wlog.checked = true;
+    theForm.wverbose.checked = true;
+    theForm.wcommand.checked = true;
+    theForm.wagent.checked = true;
+    theForm.wuser.checked = true;
+  } else {
+    theForm.wsystem.checked = false;
+    theForm.wcall.checked = false;
+    theForm.wlog.checked = false;
+    theForm.wverbose.checked = false;
+    theForm.wcommand.checked = false;
+    theForm.wagent.checked = false;
+    theForm.wuser.checked = false;
+  }
+}
+
+function readCheck() {
+  if (theForm.rallnone.checked) {
+    theForm.rsystem.checked = true;
+    theForm.rcall.checked = true;
+    theForm.rlog.checked = true;
+    theForm.rverbose.checked = true;
+    theForm.rcommand.checked = true;
+    theForm.ragent.checked = true;
+    theForm.ruser.checked = true;
+  } else {
+    theForm.rsystem.checked = false;
+    theForm.rcall.checked = false;
+    theForm.rlog.checked = false;
+    theForm.rverbose.checked = false;
+    theForm.rcommand.checked = false;
+    theForm.ragent.checked = false;
+    theForm.ruser.checked = false;
+  }
+}
-
-function checkConf()
@@ -143 +226 @@
-  if (theForm.permit.value.search(/\b(?:\d{1,3}\.){3}\d{1,3}\b\/\b(?:\d{1,3}\.){3}\d{1,3}\b(&\b(?:\d{1,3}\.){3}\d{1,3}\b\/\b(?:\d{1,3}\.){3}\d{1,3}\b)*$/))
-    return warnInvalid(theForm.name, errPermit);
-  if (theForm.read.value.search(/\b(system|call|log|verbose|command|agent|user)\b(,\b(system|call|log|verbose|command|agent|user)\b)*$/))
-    return warnInvalid(theForm.name, errRead);
-  if (theForm.write.value.search(/\b(system|call|log|verbose|command|agent|user)\b(,\b(system|call|log|verbose|command|agent|user)\b)*$/))
-    return warnInvalid(theForm.name, errWrite);
-    
-  return true;
-}