tutos-commits Mailing List for TUTOS (Page 15)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 992
          http://sourceforge.net/p/tutos/code/992
Author:   gokohnert
Date:     2013-03-04 12:40:11 +0000 (Mon, 04 Mar 2013)
Log Message:
-----------
session lists for memcache stroed sessions / new ldap auth userdomain arg

Modified Paths:
--------------
    trunk/php/admin/memcache.php
    trunk/php/admin_show.php
    trunk/php/config_default.pinc
    trunk/php/permission.p3

Modified: trunk/php/admin/memcache.php
===================================================================

--- trunk/php/admin/memcache.php	2013-03-04 10:05:01 UTC (rev 991)
+++ trunk/php/admin/memcache.php	2013-03-04 12:40:11 UTC (rev 992)
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2001 - 2012 by Gero Kohnert
+ * Copyright 2001 - 2013 by Gero Kohnert
  *
  *  SVN Info  $Id$
  *  $Author$
@@ -9,6 +9,8 @@
  * @module memcache
  * @package BASE
  */
+$tutos['files'][__FILE__] = '$Rev$';
+
 $tutos['base'] = "../..";
 ini_set("include_path","..");
 require_once 'webelements.p3';

Modified: trunk/php/admin_show.php
===================================================================
--- trunk/php/admin_show.php	2013-03-04 10:05:01 UTC (rev 991)
+++ trunk/php/admin_show.php	2013-03-04 12:40:11 UTC (rev 992)
@@ -273,22 +273,11 @@
     }
 
     /**
-     *
+     * print a headline in the sessions info
      */
-    Function Sessions_Info() {
-        global $lang,$tutos;
-
-        $r = '';
-        $n = new TUTOS_Date_Time();
-
-        $ts = $n->getTimeStamp();
-
-        $handle = opendir($tutos[sessionpath]);
-        if (! $handle ) {
-            return;
-        }
-
-        // Sessions
+    Function Sessions_HeadLine() {
+        global $lang;
+        $r  = '';
         $r .= "<tr>\n";
         $r .= " <th colspan=\"9\">Sessions</th>\n";
         $r .= "</tr>\n";
@@ -303,103 +292,152 @@
         $r .= $this->orderHeader('', $lang['ClientBrowser'], '', 1);
         $r .= $this->orderHeader('', $lang['AdminKillSession'], '', 1);
         $r .= "</tr>\n";
+        return $r;
+    }
 
-        $line = 0;
-        while (false !== ($file = readdir($handle))) {
-            if ( ! preg_match("#^sess_#", $file) ) {
-                continue;
-            }
-            $filename =  $tutos[sessionpath] .'/'. $file;
-            if ( filesize($filename) == 0 ) {
-                continue;
-            }
-            if ( ! is_readable($filename) ) {
-                continue;
-            }
+    /**
+     * print a line in the sessions info
+     */
+    Function Sessions_Line($data,$id) {
+        global $lang,$tutos;
 
-            $x        = fopen($filename, 'r+b');
-            $contents = fread($x, filesize($filename));
+        $n = new TUTOS_Date_Time();
+        $ts = $n->getTimeStamp();
 
-            fclose($x);
+        $r = '';
+        if (!isset($data['userid'])) {
+            return;
+        }
+        if (!isset($data['username'])) {
+            return;
+        }
+        if (!isset($data['path'])) {
+            $data['path'] ="?";
+        }
+        if (!isset($data['client'])) {
+            $data['client'] ="?";
+        }
+        if (!isset($data['server'])) {
+            $data['server'] ="?";
+        }
+        if ($data['dbnr'] != $this->dbconn->db->id) {
+            return;
+        }
+        $r .= $this->OverviewRowStart($this->line);
+        $r .= ' <td class="over_l">';
+        $r .= makelink('address_show.php?id='.$data['userid'], $data['username']) ."</td>\n";
+        $r .= ' <td class="over_l">'. $data['path'] ."</td>\n";
+        $r .= ' <td class="over_l">'. $data['server'] ."</td>\n";
 
-            $data = unserialize_session($contents);
+        $ago = ($ts - $data['lastseen']);
+        $x1  = $ago%60; // remaining seconds
+        $x2  = floor($ago/60)%60; // minutes;
+        $x3  = floor($ago/3600); // hours
+        $age = sprintf('%d:%02d:%02d', $x3, $x2, $x1);
 
-            if (!isset($data['userid'])) {
-                continue;
+        $r .= ' <td class="over_r">'. $age." ago</td>\n";
+
+        $x1 = $data['lasthost'];
+        $x2 = $x1;
+
+        if (($tutos['resolve_host'] == 1) && strstr($x1, '.') && !strstr($x1, ' ')) {
+            $x2  = '<br />(';
+            $x2 .= @gethostbyaddr($x1);
+            $x2 .= ')';
+        } else if ( (ini_get('allow_url_fopen') == 1) &&
+                    ($tutos['resolve_host'] == 2) &&
+                    strstr($x1, '.') &&
+                    !strstr($x1, ' ')) {
+            // see http://perishablepress.com/code-snippets/#code-snippets_php
+            $url = 'http://api.hostip.info/get_html.php?ip='.$x1;
+            $contents = file_get_contents($url);
+            $values   = preg_split("#[\n|\r]#", $contents);
+            $count    = count($values);
+
+            $x2  = '';
+            $pre = '<br>';
+            for ($i = 0; $i < $count; $i++) {
+                if (strstr($values[$i], 'IP:')) continue;
+                if ($i != $count-1) {
+                    $x2 .= $pre.myriconv($values[$i]);
+                }
             }
-            if (!isset($data['username'])) {
-                continue;
-            }
-            if (!isset($data['path'])) {
-                $data['path'] ="?";
-            }
-            if (!isset($data['client'])) {
-                $data['client'] ="?";
-            }
-            if (!isset($data['server'])) {
-                $data['server'] ="?";
-            }
-            if ($data['dbnr'] != $this->dbconn->db->id) {
-                continue;
-            }
-            $r .= $this->OverviewRowStart($line);
-            $r .= ' <td class="over_l">';
-            $r .= makelink('address_show.php?id='.$data['userid'], $data['username']) ."</td>\n";
-            $r .= ' <td class="over_l">'. $data['path'] ."</td>\n";
-            $r .= ' <td class="over_l">'. $data['server'] ."</td>\n";
+        }
 
-            $ago = ($ts - $data['lastseen']);
-            $x1  = $ago%60; // remaining seconds
-            $x2  = floor($ago/60)%60; // minutes;
-            $x3  = floor($ago/3600); // hours
-            $age = sprintf('%d:%02d:%02d', $x3, $x2, $x1);
 
-            $r .= ' <td class="over_r">'. $age." ago</td>\n";
+        if ($tutos[debug] != 0)
+            $x1l = makelink('admin_show.php?mode=logfile&amp;filter='.$x1, $x1);
+        else
+            $x1l = $x1;
+        $r .= ' <td class="over_l">'. $x1l.($x2 != $x1 ? $x2:"") ."</td>\n";
+        $r .= ' <td>'. $data['client'] ."&#160;</td>\n";
 
-            $x1 = $data['lasthost'];
-            $x2 = $x1;
+        $u = addUrlParameter($this->link2, "action=kill");
+        $u = addUrlParameter($u, 'mark='.$id);
 
-            if (($tutos['resolve_host'] == 1) && strstr($x1, '.') && !strstr($x1, ' ')) {
-                $x2  = '<br />(';
-                $x2 .= @gethostbyaddr($x1);
-                $x2 .= ')';
-            } else if ( (ini_get('allow_url_fopen') == 1) &&
-                        ($tutos['resolve_host'] == 2) &&
-                        strstr($x1, '.') &&
-                        !strstr($x1, ' ')) {
-                // see http://perishablepress.com/code-snippets/#code-snippets_php
-                $url = 'http://api.hostip.info/get_html.php?ip='.$x1;
-                $contents = file_get_contents($url);
-                $values   = preg_split("#[\n|\r]#", $contents);
-                $count    = count($values);
+        $r .= ' <td align="center">&#160;'. makelink($u, 'kill') ."</td>\n";
+        $r .= $this->OverviewRowEnd($this->line++);
+        return $r;
+    }
 
-                $x2  = '';
-                $pre = '<br>';
-                for ($i = 0; $i < $count; $i++) {
-                    if (strstr($values[$i], 'IP:')) continue;
-                    if ($i != $count-1) {
-                        $x2 .= $pre.myriconv($values[$i]);
-                    }
+    /**
+     *
+     */
+    Function Sessions_Info() {
+        global $lang,$tutos;
+
+        $this->line = 0;
+
+        $r = '';
+
+        if (ini_get('session.save_handler') == 'files') {
+            $handle = opendir($tutos[sessionpath]);
+            if (! $handle ) {
+                return;
+            }
+            // Sessions
+            $r .= $this->Sessions_Headline();
+            while (false !== ($file = readdir($handle))) {
+                if ( ! preg_match("#^sess_#", $file) ) {
+                    continue;
                 }
-            }
+                $filename =  $tutos[sessionpath] .'/'. $file;
+                if ( filesize($filename) == 0 ) {
+                    continue;
+                }
+                if ( ! is_readable($filename) ) {
+                    continue;
+                }
+                $x        = fopen($filename, 'r+b');
+                $contents = fread($x, filesize($filename));
 
+                fclose($x);
 
-            if ($tutos[debug] != 0)
-                $x1l = makelink('admin_show.php?mode=logfile&amp;filter='.$x1, $x1);
-            else
-                $x1l = $x1;
-            $r .= ' <td class="over_l">'. $x1l.($x2 != $x1 ? $x2:"") ."</td>\n";
-            $r .= ' <td>'. $data['client'] ."&#160;</td>\n";
+                $data = unserialize_session($contents);
+                $r .= $this->Sessions_Line($data,$file);
+            }
 
-            $u = addUrlParameter($this->link2, "action=kill");
-            $u = addUrlParameter($u, 'mark='.$file);
+            $r .= $this->SubTableEnd();
+            $r .= "</td></tr>\n";
+            closedir($handle);
+        } else if (ini_get('session.save_handler') == 'memcache') {
+            $r .= $this->Sessions_Headline();
+            $y = array();
+            $x = $tutos['memcache']->get('sessions');
+            $d = $tutos['memcache']->get(array_keys($x));
+            foreach ($d as $key => $data) {
+                $r .= $this->Sessions_Line(unserialize_session($data),$key);
+                unset($x[$key]);
+                $y[$key] = $data;
+            }
+            foreach ($x as $key => $data) {
+                $d = $tutos['memcache']->delete($key);
+            }
+            $tutos['memcache']->set('sessions',$y);
+            $r .= $this->SubTableEnd();
+            $r .= "</td></tr>\n";
+        }
 
-            $r .= ' <td align="center">&#160;'. makelink($u, 'kill') ."</td>\n";
-            $r .= $this->OverviewRowEnd($line++);
-        }
-        $r .= $this->SubTableEnd();
-        $r .= "</td></tr>\n";
-        closedir($handle);
         return $r;
     }
 
@@ -732,7 +770,6 @@
         $r .= $this->login_info();
         $r .= "<tr><td colspan=\"9\">&#160;</td></tr>\n";
         $r .= $this->Sessions_Info();
-
         $r .= $this->DataTableEnd();
         return $r;
     }

Modified: trunk/php/config_default.pinc
===================================================================
--- trunk/php/config_default.pinc	2013-03-04 10:05:01 UTC (rev 991)
+++ trunk/php/config_default.pinc	2013-03-04 12:40:11 UTC (rev 992)
@@ -241,6 +241,9 @@
 $tutos[ldapauthserver]['port'] = 389;
 $tutos[ldapauthserver]['basedn'] = "ou=mail,ou=user,o=cvf";
 $tutos[ldapauthserver]['userdn'] = "uid";
+// the userdomain part is always added to the giiven username before binding to ldap
+// example $tutos[ldapauthserver]['userdomain'] = "@tutos.org";
+$tutos[ldapauthserver]['userdomain'] = '';
 // Use a filter to find user. Uncomment and modify if needed
 // The only available replacement is %u for user login name
 #$tutos[ldapauthserver]['filter'] = "(&(uid=%u)(resources=tutos))";
@@ -769,10 +772,10 @@
 //
 // The TUTOS Version number
 //
-$tutos[version] = '1.9.20130303';
+$tutos[version] = '1.9.20130304';
 //
 ### Local Variables: ***
 ### mode:iso-accents ***
 ### coding:utf-8 ***
 ### End: ***
-?>
\ No newline at end of file
+?>

Modified: trunk/php/permission.p3
===================================================================
--- trunk/php/permission.p3	2013-03-04 10:05:01 UTC (rev 991)
+++ trunk/php/permission.p3	2013-03-04 12:40:11 UTC (rev 992)
@@ -453,7 +453,15 @@
         //dterror_log('new session  '."\n", 3, $tutos[errlog]);
         $tutos['SESSID'] = session_id();
         $userid = -1;
-
+        // store session id
+        if (ini_get('session.save_handler') == 'memcache') {
+            $x = $tutos['memcache']->get('sessions');
+            if ($x === false) {
+                $x = array();
+            }
+            $x[session_id()] = 1;
+            $tutos['memcache']->set('sessions',$x);
+        }
         $dbnr = $auth[0]->getDatabaseNr();
         $dbconn = DB_Open($dbnr);
         if ($dbconn == null) {
@@ -707,34 +715,49 @@
 Function remove_sessionfiles () {
     global $tutos;
 
-    $handle = opendir($tutos[sessionpath]);
-    if (! $handle ){
-        return;
+    if (ini_get('session.save_handler') == 'memcache') {
+        $x = $tutos['memcache']->get('sessions');
+        $y = array();
+        $d = $tutos['memcache']->get(array_keys($x));
+        foreach ($d as $key => $data) {
+            unset($x[$key]);
+            $y[$key] = $data;
+        }
+        foreach ($x as $key => $data) {
+            $d = $tutos['memcache']->delete($key);
+        }
+        $tutos['memcache']->set('sessions',$y);
     }
-    while (false !== ($file = readdir($handle))) {
-        if ( !preg_match('#^sess_#',$file) && !preg_match('#^tutosfile#',$file) ) {
-            continue;
+    if (ini_get('session.save_handler') == 'files') {
+        $handle = opendir($tutos[sessionpath]);
+        if (! $handle ){
+            return;
         }
+        while (false !== ($file = readdir($handle))) {
+            if ( !preg_match('#^sess_#',$file) && !preg_match('#^tutosfile#',$file) ) {
+                continue;
+            }
 
-        $filename =  $tutos[sessionpath] ."/". $file;
+            $filename =  $tutos[sessionpath] ."/". $file;
 
-        if ( ! is_writeable($filename) ) continue;
+            if ( ! is_writeable($filename) ) continue;
 
-        $age = time() - filemtime($filename);
-        if ( preg_match('#^sess_#',$file) ) {
-            if ($age < (2* $tutos['timetolive'] * 60)) {
-                continue;
+            $age = time() - filemtime($filename);
+            if ( preg_match('#^sess_#',$file) ) {
+                if ($age < (2* $tutos['timetolive'] * 60)) {
+                    continue;
+                }
             }
-        }
-        if ( preg_match('#^tutosfile#',$file) ) {
-            if ( $age < 60 ) {
-                continue;
+            if ( preg_match('#^tutosfile#',$file) ) {
+                if ( $age < 60 ) {
+                    continue;
+                }
             }
+            // echo $filename." ".date ("F d Y H:i:s.", filemtime($filename))." ". $age/3600 ."<br>\n";
+            unlink($filename);
         }
-        // echo $filename." ".date ("F d Y H:i:s.", filemtime($filename))." ". $age/3600 ."<br>\n";
-        unlink($filename);
+        closedir($handle);
     }
-    closedir($handle);
 }
 
 /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2001	Jan	Feb	Mar	Apr	May	Jun	Jul (13)	Aug (214)	Sep (144)	Oct (22)	Nov (22)	Dec (93)
2002	Jan (25)	Feb (31)	Mar (92)	Apr (70)	May (103)	Jun (130)	Jul (265)	Aug (325)	Sep (233)	Oct (244)	Nov (261)	Dec (157)
2003	Jan (101)	Feb (135)	Mar (148)	Apr (164)	May (53)	Jun (116)	Jul (149)	Aug (126)	Sep (45)	Oct (109)	Nov (36)	Dec (61)
2004	Jan (131)	Feb (236)	Mar (278)	Apr (259)	May (92)	Jun (110)	Jul (150)	Aug (64)	Sep (141)	Oct (141)	Nov (146)	Dec (65)
2005	Jan (70)	Feb (77)	Mar (129)	Apr (153)	May (161)	Jun (63)	Jul (42)	Aug (16)	Sep (30)	Oct (3)	Nov (8)	Dec (40)
2006	Jan (114)	Feb (16)	Mar (12)	Apr (15)	May (4)	Jun (9)	Jul (69)	Aug (27)	Sep (12)	Oct (80)	Nov (62)	Dec (41)
2007	Jan (34)	Feb (2)	Mar (38)	Apr (82)	May (61)	Jun (37)	Jul (16)	Aug (64)	Sep (7)	Oct (52)	Nov (18)	Dec (28)
2008	Jan (168)	Feb (26)	Mar (27)	Apr (19)	May (10)	Jun (58)	Jul (58)	Aug (91)	Sep (14)	Oct (23)	Nov (56)	Dec (38)
2009	Jan (58)	Feb (90)	Mar (204)	Apr (90)	May (27)	Jun (177)	Jul (116)	Aug (53)	Sep (42)	Oct (120)	Nov (51)	Dec (58)
2010	Jan (117)	Feb (231)	Mar (163)	Apr (90)	May (40)	Jun (139)	Jul (49)	Aug (118)	Sep (25)	Oct (80)	Nov (102)	Dec (99)
2011	Jan (176)	Feb (42)	Mar (60)	Apr (52)	May (30)	Jun (29)	Jul (27)	Aug (16)	Sep (51)	Oct (70)	Nov (63)	Dec (58)
2012	Jan (28)	Feb (26)	Mar (7)	Apr (12)	May (41)	Jun (61)	Jul (59)	Aug (38)	Sep (30)	Oct (28)	Nov (14)	Dec (31)
2013	Jan (24)	Feb (54)	Mar (45)	Apr (22)	May (35)	Jun (8)	Jul (18)	Aug (38)	Sep (11)	Oct (8)	Nov (19)	Dec (20)
2014	Jan (20)	Feb (22)	Mar (4)	Apr (6)	May (13)	Jun	Jul	Aug (1)	Sep	Oct	Nov	Dec (6)
2015	Jan	Feb (1)	Mar (4)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec (1)
2016	Jan (4)	Feb	Mar	Apr (1)	May	Jun	Jul (2)	Aug (4)	Sep (1)	Oct (1)	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (3)	Jul (8)	Aug (13)	Sep (12)	Oct	Nov	Dec
2018	Jan	Feb	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2020	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (2)
2021	Jan	Feb (1)	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

tutos-commits Mailing List for TUTOS (Page 15)

Projects / CRM / PLM / Calendar / Tasks / SCRUM / Test / Inventory

tutos-commits — SVN commits