Merge branch 'master' of http://git.roojs.com:8081/Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 6341da5..a745ee0 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -390,8 +390,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
     }
     
      
-    function toRooArray($req = array()) {
-      //  echo '<PRE>';print_r($req);exit;
+    function toRooArray($req) {
+        
         $ret= $this->toArray();
       
         static $ff = false;

diff --git a/GnumericToExcel.php b/GnumericToExcel.php
index 25f2ff3..df04fd9 100644 (file)
--- a/GnumericToExcel.php
+++ b/GnumericToExcel.php
@@ -48,9 +48,9 @@ class Pman_Core_GnumericToExcel extends Pman
         
         $xml = iconv("UTF-8", "UTF-8//IGNORE",  $xml);
         
-        //$xml = str_replace('é', 'e', $xml);
+        //$xml = str_replace('�', 'e', $xml);
         //$xml = str_replace("\xA0", ' ', $xml);
-        //$xml = str_replace("Ø", 'dia.',$xml);
+        //$xml = str_replace("�", 'dia.',$xml);
         
         //$this->addEvent("DOWNLOAD", false, isset($_REQUEST['title']) ? $_REQUEST['title'] : '???');
         

diff --git a/NotifySmtpCheck.php b/NotifySmtpCheck.php
new file mode 100644 (file)
index 0000000..4688f36
--- /dev/null
+++ b/NotifySmtpCheck.php
@@ -0,0 +1,76 @@
+<?php
+
+require_once 'Pman.php';
+require_once "Mail.php";
+require_once 'Mail/smtpmx.php';
+        
+class Pman_Core_NotifySmtpCheck extends Pman
+{
+    static $cli_desc = "Check SMTP";
+ 
+    static $cli_opts = array();
+        
+    function get()
+    {
+        $this->check();
+        
+    }
+    
+    function check()
+    {
+        $ff = HTML_FlexyFramework::get();
+        
+        if(
+                empty($ff->Core_Notify) ||
+                empty($ff->Core_Notify['routes'])
+        ){
+            return;
+        }
+        
+        $ip = file_get_contents("https://ifconfig.co/");
+        print_R($ip);exit;
+        
+        $error = array();
+        
+        foreach ($ff->Core_Notify['routes'] as $server => $settings){
+            if(empty($settings['domains']) || empty($settings['username']) || empty($settings['password'])){
+                $error[] = "{$server} missing domains / username / password";
+                continue;
+            }
+            
+            foreach ($settings['domains'] as $dom){
+                
+                $socket_options = array (
+                    'ssl' => array(
+                        'verify_peer'  => false,
+                        'verify_peer_name'  => false,
+                        'allow_self_signed' => true
+                    )
+                );
+                
+                $smtp = new Net_SMTP($server, $settings['port'], '058177247238.ctinets.com', false, 0, $socket_options);
+                
+                $smtp->setDebug(true);
+                
+                $res = $smtp->connect(10);
+                
+                if (is_a($res, 'PEAR_Error')) {
+                    die("Cound not connect to {$server}");
+                }
+                
+                $res = $smtp->auth($settings['username'], $settings['password']);
+            
+                if (is_a($res, 'PEAR_Error')) {
+                    die($res);
+                }
+                
+                print_R("SUCCESS? {$res} \n");
+                exit;
+                   
+            }
+            
+            
+        }
+    }
+    
+}
\ No newline at end of file

diff --git a/Pman.js b/Pman.js
index 35c17be..7d0adeb 100644 (file)
--- a/Pman.js
+++ b/Pman.js
@@ -861,15 +861,20 @@ Pman = new Roo.Document(
             
                 // we now have permission...
                 // obj.moduleOwner '.' lname
-           
+            
             if (Pman.hasPermExists(permname) && !Pman.hasPerm(permname,'S')) {
                 // it's a turned off permission...
                 Roo.log(permname + " is Disabled for this user");
                 obj.disabled = true;
                 return;
             }
-        
             
+            if (obj.permname && obj.permname.length && Pman.hasPermExists(obj.permname) && !Pman.hasPerm(obj.permname,'S')) {
+                // it's a turned off permission...
+                Roo.log(obj.permname + " is Disabled for this user");
+                obj.disabled = true;
+                return;
+            }
             
         }
         

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 72c1b9c..12c4c57 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -135,6 +135,14 @@ class Pman_Core_UpdateDatabase extends Pman
    
         $ff = HTML_FlexyFramework::get();
         
+//        if(!empty($ff->Core_Notify)){
+//            require_once 'Pman/Core/NotifySmtpCheck.php';
+//            $x = new Pman_Core_NotifySmtpCheck();
+//            $x->check();
+//        }
+//        
+//        EXIT;
+        
         $this->disabled = explode(',', $ff->disable);
         
         //$this->fixSequencesPgsql();exit;
@@ -192,7 +200,6 @@ class Pman_Core_UpdateDatabase extends Pman
         
         $ar = $this->modulesList();
         
-        
         foreach($ar as $m) {
             
             if(in_array($m, $this->disabled)){