php-blog-plugin-cvs — Plugin developer commit list (READ-ONLY)

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_multilingual serendipity_event_multilingual.php,1.4,1.5

[Nightly <ni...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_multilingual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv372

Modified Files:
	serendipity_event_multilingual.php 
Log Message:
Added lang_display to allow for searching/viewing of entries in specified language only.


Index: serendipity_event_multilingual.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_multilingual/serendipity_event_multilingual.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_event_multilingual.php	9 Jan 2005 12:43:49 -0000	1.4
+++ serendipity_event_multilingual.php	10 Jan 2005 17:03:54 -0000	1.5
@@ -49,8 +49,11 @@
             'backend_entryform'                                 => true,
             'backend_entry_presave'                             => true
         ));
-        $this->supported_properties = array('lang_selected');
+        $this->supported_properties = array('lang_selected','lang_display');
 
+        if (isset($serendipity['GET']['lang_display'])) {
+            $this->lang_display = serendipity_db_escape_string($serendipity['GET']['lang_display']);
+        }
         if (empty($this->showlang) && isset($serendipity['POST']['properties']['lang_selected'])) {
             $this->showlang = serendipity_db_escape_string($serendipity['POST']['properties']['lang_selected']);
         } elseif (empty($this->showlang) && isset($serendipity['GET']['lang_selected'])) {
@@ -187,7 +190,6 @@
 <?php
                     return true;
                     break;
-
                 case 'entry_display':
                     if ($bag->get('scrambles_true_content') && is_array($addData) && isset($addData['no_scramble'])) {
                         return true;
@@ -196,7 +198,6 @@
                     if (!is_array($eventData)) {
                         return false;
                     }
-
                     $msg = '<div class="serendipity_multilingualInfo">' . PLUGIN_EVENT_MULTILINGUAL_SWITCH . ': %s</div>';
                     if ($addData['extended'] || $addData['preview']) {
                         if ($langs = $this->getLang($eventData[0]['id'], $eventData[0]['properties'])) {
@@ -224,6 +225,14 @@
                                 $eventData[$i]['add_footer'] = '';
                             }
 
+                            if (!empty($this->lang_display)) {
+                                // Not sure if it's the best way to get translations shown instead of the 
+                                // original entries
+
+                                $eventData[$i]['title'] = $eventData[$i]['multilingual_title'];
+                                $eventData[$i]['body'] = $eventData[$i]['multilingual_body'];
+                                $eventData[$i]['extended'] = $eventData[$i]['multilingual_extended'];
+                            }
                             if ($langs = $this->getLang($eventData[$i]['id'], $eventData[$i]['properties'])) {
                                 $eventData[$i]['add_footer'] .= sprintf($msg, $langs);
                             }
@@ -272,12 +281,11 @@
                         return true;
                     }
                     $q = "SELECT entryid, property, value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid IN (" . implode(', ', array_keys($addData)) . ") AND property LIKE '%multilingual_%'";
-
+                                     
                     $properties = serendipity_db_query($q);
                     if (!is_array($properties)) {
                         return true;
                     }
-
                     foreach($properties AS $idx => $row) {
                         $eventData[$addData[$row['entryid']]]['properties'][$row['property']] = $row['value'];
                     }
@@ -286,10 +294,13 @@
 
                 case 'frontend_fetchentries':
                 case 'frontend_fetchentry':
-                    if (empty($this->showlang)) {
-                        return;
+                    if (!empty($this->lang_display)) {
+                        $this->showlang = $this->lang_display;
                     }
 
+                    if (empty($this->showlang)) {
+                         return;
+                    }
                     $cond  = "multilingual_body.value AS multilingual_body,\n";
                     $cond .= "multilingual_extended.value AS multilingual_extended,\n";
                     $cond .= "multilingual_title.value AS multilingual_title,\n";
@@ -298,7 +309,6 @@
                     } else {
                         $eventData['addkey'] .= $cond;
                     }
-
                     $cond  = "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties multilingual_body
                                                  ON (e.id = multilingual_body.entryid AND multilingual_body.property = 'multilingual_body_" . $this->showlang . "')";
                     $cond .= "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties multilingual_extended
@@ -306,12 +316,16 @@
                     $cond .= "LEFT OUTER JOIN {$serendipity['dbPrefix']}entryproperties multilingual_title
                                                  ON (e.id = multilingual_title.entryid AND multilingual_title.property = 'multilingual_title_" . $this->showlang . "')";
 
+                    if (!empty($this->lang_display)) {
+                        // If lang_display is set - we want ONLY the entries which have translation
+                        $eventData['and'] .= " AND multilingual_body.value IS NOT NULL";
+                    } 
+
                     if (empty($eventData['joins'])) {
                         $eventData['joins'] = $cond;
                     } else {
                         $eventData['joins'] .= $cond;
                     }
-
                     return true;
                     break;
 

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_multilingual serendipity_event_multilingual.php,1.3,1.4

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_multilingual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27237/serendipity_event_multilingual

Modified Files:
	serendipity_event_multilingual.php 
Log Message:
fix copy+paste mistake detected by Nightly. Thanks!


Index: serendipity_event_multilingual.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_multilingual/serendipity_event_multilingual.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_event_multilingual.php	20 Dec 2004 13:41:42 -0000	1.3
+++ serendipity_event_multilingual.php	9 Jan 2005 12:43:49 -0000	1.4
@@ -271,7 +271,7 @@
                         // Fetching of properties is already done there, so this is just for poor users who don't have the entryproperties plugin enabled
                         return true;
                     }
-                    $q = "SELECT entryid, property, value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid IN (" . implode(', ', array_keys($addData)) . ") AND property LIKE '%freetag_%'";
+                    $q = "SELECT entryid, property, value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid IN (" . implode(', ', array_keys($addData)) . ") AND property LIKE '%multilingual_%'";
 
                     $properties = serendipity_db_query($q);
                     if (!is_array($properties)) {

[Php-blog-plugin-cvs] additional_plugins/serendipity_plugin_photoblog serendipity_plugin_photoblog.php,1.1,1.2

[Riken <ri...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_plugin_photoblog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18409

Modified Files:
	serendipity_plugin_photoblog.php 
Log Message:
Adding option to allow only thumbnail entries in sidebar. Also general cleanup.

Index: serendipity_plugin_photoblog.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_plugin_photoblog/serendipity_plugin_photoblog.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_plugin_photoblog.php	5 Jan 2005 02:25:12 -0000	1.1
+++ serendipity_plugin_photoblog.php	9 Jan 2005 03:04:46 -0000	1.2
@@ -2,11 +2,12 @@
 
 switch ($serendipity['lang']) {
     default:
-        @define('PLUGIN_PHOTOBLOG_TITLE', 'Photoblog Entries');
-        @define('PLUGIN_PHOTOBLOG_BLAHBLAH', 'Shows the thumbnails of the most recent photoblog entries');
-        @define('PLUGIN_PHOTOBLOG_NUMBER', 'Number of entries');
+        @define('PLUGIN_PHOTOBLOG_TITLE',           'Photoblog Entries');
+        @define('PLUGIN_PHOTOBLOG_BLAHBLAH',        'Shows the thumbnails of the most recent photoblog entries.');
+        @define('PLUGIN_PHOTOBLOG_NUMBER',          'Number of entries');
         @define('PLUGIN_PHOTOBLOG_NUMBER_BLAHBLAH', 'How many entries should be displayed? (Default: 5)');
-
+        @define('PLUGIN_PHOTOBLOG_SHOWPICSONLY',    'Only show images?');
+        @define('PLUGIN_PHOTOBLOG_SHOWPICSONLY_BLAHBLAH', 'Only show entries with an image, instead of both.');
         break;
 }
 
@@ -15,16 +16,23 @@
     function introspect(&$propbag) {
         $propbag->add('name',        PLUGIN_PHOTOBLOG_TITLE);
         $propbag->add('description', PLUGIN_PHOTOBLOG_BLAHBLAH);
-        $propbag->add('configuration', array('number'));
+        $propbag->add('configuration', array('number', 'showpicsonly'));
     }
 
     function introspect_config_item($name, &$propbag) {
         switch($name) {
             case 'number':
-                $propbag->add('type', 'string');
-                $propbag->add('name', PLUGIN_PHOTOBLOG_NUMBER);
-                $propbag->add('description', PLUGIN_PHOTOBLOG_NUMBER_BLAHBLAH);
-                $propbag->add('default', 5);
+                $propbag->add('type',           'string');
+                $propbag->add('name',           PLUGIN_PHOTOBLOG_NUMBER);
+                $propbag->add('description',    PLUGIN_PHOTOBLOG_NUMBER_BLAHBLAH);
+                $propbag->add('default',        5);
+                break;
+            
+            case 'showpicsonly':
+                $propbag->add('type',           'boolean');
+                $propbag->add('name',           PLUGIN_PHOTOBLOG_SHOWPICSONLY);
+                $propbag->add('description',    PLUGIN_PHOTOBLOG_SHOWPICSONLY_BLAHBLAH);
+                $propbag->add('default',        'false');
                 break;
 
             default:
@@ -48,7 +56,8 @@
     function generate_content(&$title) {
         global $serendipity;
 
-        $number     = $this->get_config('number');
+        $number = $this->get_config('number');
+        $showpicsonly = $this->get_config('showpicsonly');
 
         if (!$number || !is_numeric($number) || $number < 1) {
             $number = 5;
@@ -102,6 +111,9 @@
                                'serendipityHTTPPath'
                             );
                 $photo = $this->getPhoto($entry['id']);
+                
+                if (($showpicsonly == 'true') && (isset($photo)) || ($showpicsonly != 'true'))
+                {
                 if (isset($photo)) {
                     $file = serendipity_fetchImageFromDatabase($photo['photoid']);
                     $imgsrc= $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] .'.'. $file['extension'];
@@ -127,6 +139,7 @@
                     }
                 }
                 echo '</a><br />';
+                }
             }
         }
     }

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_photoblog serendipity_event_photoblog.php,1.1,1.2

[Riken <ri...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_photoblog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18055

Modified Files:
	serendipity_event_photoblog.php 
Log Message:
Fixing bug with the clear button

Index: serendipity_event_photoblog.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_photoblog/serendipity_event_photoblog.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_photoblog.php	5 Jan 2005 02:25:08 -0000	1.1
+++ serendipity_event_photoblog.php	9 Jan 2005 03:03:01 -0000	1.2
@@ -149,7 +149,7 @@
                 $file = $this->parsePhotoname($prop_val);
                 $this->updatePhoto($eventData['id'], $file['id']);
             } else {
-                $this->clearPhoto($eventData['id']);
+                $this->deletePhoto($eventData['id']);
             }
         } elseif(!empty($prop_val)) {
             $file = $this->parsePhotoname($prop_val);

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_externalauth serendipity.schema.example,1.1,1.2

[Justin A. <jba...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29913

Modified Files:
	serendipity.schema.example 
Log Message:
Change in example schema


Index: serendipity.schema.example
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth/serendipity.schema.example,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity.schema.example	7 Jan 2005 19:36:23 -0000	1.1
+++ serendipity.schema.example	7 Jan 2005 20:06:31 -0000	1.2
@@ -13,4 +13,5 @@
 objectclass ( 2.16.840.1.555555.1.1.1
 	NAME 'serendipityUser'
 	DESC 'User of Serendipity Blog Software'
-	MAY	serendipityUserLevel )
+    SUP top AUXILIARY
+	MAY	( serendipityUserlevel ) )

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_externalauth serendipity.schema.example,NONE,1.1 serendipity_event_externalauth.php,1.5,1.6

[Justin A. <jba...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22818

Modified Files:
	serendipity_event_externalauth.php 
Added Files:
	serendipity.schema.example 
Log Message:
collapse check for valid, and change function - mysql_affected_rows
returns 0 on an UPDATE that doesn't change anything, resulting
in us inserting multiple rows.  Added functions to core cvs
include/db/*.inc.db files.

Also, an example of a schema for openLDAP


Index: serendipity_event_externalauth.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth/serendipity_event_externalauth.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_event_externalauth.php	7 Jan 2005 17:32:08 -0000	1.5
+++ serendipity_event_externalauth.php	7 Jan 2005 19:36:23 -0000	1.6
@@ -198,51 +198,47 @@
                                     if ($res = @ldap_read($ds,$rdn,$srch,$attributes)) {
                                         $e = ldap_first_entry($ds,$res);
                                         $attr = ldap_get_attributes($ds,$e);
-                                        if ($attr[$this->get_config('ldap_userlevel_attr')]["count"] > 0) {
-                                            $valid_userlevel = $attr[$this->get_config('ldap_userlevel_attr')][0];
+                                        $userlevel_attr = $this->get_config('ldap_userlevel_attr');
+                                        if ($attr[$userlevel_attr] > -1) {
+                                            $valid_userlevel = $attr[$userlevel_attr][0];
                                         } else {
                                             $valid_userlevel = $this->get_config('userlevel');
                                         }
                                     }
-                                } 
-                                ldap_close($ds);
-                            } else {
-                                $valid = false;
-                            }
-                            break;
-                    }
-
-                    if ($valid) {
-                        if ($valid_userlevel > -1) {
-                            // If the ldap user exists and the password is correct, and the user has a valid userlevel OR the default userlevel is valid, 
-                            //    update the user's record or create it if it doesn't exist.
-                            serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
-                                                 SET password = '" . serendipity_db_escape_string($md5_password) . "'
-                                               WHERE username = '" . serendipity_db_escape_string($addData['username']) . "'");
-                            if (serendipity_db_affected_rows() == 0) {
-                                serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}authors (username, password, email, mail_comments, mail_trackbacks, userlevel)
-                                                       VALUES ('". serendipity_db_escape_string($addData['username']) ."', '". serendipity_db_escape_string($md5_password) . "', '" . serendipity_db_escape_string($attr["mail"][0]) . "', 1, 1, " . $valid_userlevel . ")");
-                            }
-                        } else {
-                            // If the username and password are correct in the ldap server, but the userlevel is set to DENY, invalidate the SQL user.
-                            serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
+                                    if ($valid_userlevel > -1) {
+                                        // If the ldap user exists and the password is correct, and the user has a valid userlevel OR the default userlevel is valid, 
+                                        //    update the user's record or create it if it doesn't exist.
+                                        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
+                                                 SET password = '" . serendipity_db_escape_string($md5_password) . "', userlevel = " . $valid_userlevel . 
+                                               " WHERE username = '" . serendipity_db_escape_string($addData['username']) . "'");
+                                        if (serendipity_db_matched_rows() == 0 ) {
+                                            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}authors (username, password, email, mail_comments, mail_trackbacks, userlevel)
+                                                           VALUES ('". serendipity_db_escape_string($addData['username']) ."', '". serendipity_db_escape_string($md5_password) . "', '" . serendipity_db_escape_string($attr["mail"][0]) . "', 1, 1, " . $valid_userlevel . ")");
+                                        }
+                                    } else {
+                                        // If the username and password are correct in the ldap server, but the userlevel is set to DENY, invalidate the SQL user.
+                                        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
                                                  SET password = '" . serendipity_db_escape_string(md5(time())) . "'
                                                WHERE username = '" . serendipity_db_escape_string($addData['username']) . "'");
-                        }
-                        // if account does not exist in ldap server, or password is incorrect, return silently
-                        // N.B. - this means that disabling a user in the LDAP server by changing the password will NOT disable the user in the SQL table.
-                    }
+                                    }
+                                    // if account does not exist in ldap server, or password is incorrect, return silently
+                                    // N.B. - this means that disabling a user in the LDAP server by changing the password will NOT disable the user in the SQL table.
+                                }
+                                ldap_close($ds);
+                            } 
+                            break; // case source ldap (and default)
+                    } // switch source
 
                     return true;
-                    break;
+                    break; // case event backend_auth
 
                 default:
                     return false;
                     break;
-            }
+            } // switch event
         } else {
             return false;
-        }
+        } // isset hooks 'event'
     }
 }
 

--- NEW FILE: serendipity.schema.example ---
# $Id: serendipity.schema.example,v 1.1 2005/01/07 19:36:23 jbalcorn Exp $
#
# Objectclass and Attributes for workign with Serendipity Blog software.
#

attributetype ( 2.16.840.1.555555.1.1.2
    NAME 'serendipityUserlevel'
    DESC 'Serendipity Blog Login Level (-1, 0, 1, 255)'
    EQUALITY integerMatch
    SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
    SINGLE-VALUE )

objectclass ( 2.16.840.1.555555.1.1.1
	NAME 'serendipityUser'
	DESC 'User of Serendipity Blog Software'
	MAY	serendipityUserLevel )

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_externalauth serendipity_event_externalauth.php,1.4,1.5

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26718

Modified Files:
	serendipity_event_externalauth.php 
Log Message:
german translation, put back function check


Index: serendipity_event_externalauth.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth/serendipity_event_externalauth.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_event_externalauth.php	7 Jan 2005 15:28:47 -0000	1.4
+++ serendipity_event_externalauth.php	7 Jan 2005 17:32:08 -0000	1.5
@@ -8,8 +8,8 @@
         @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE_DESC', 'Wählen Sie die Quelle der externen Zugangsdaten');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL', 'Standard Benutzerlevel');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC', 'Wählen Sie den Standard-Benutzerlevel für einen neu hinzugefügten externen Benutzer');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ATTR', 'Benutzerlevel Attribute');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ATTR_DESC', 'Which Attribute contains the userlevel for a new external user?');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ATTR', 'Benutzerlevel Attribut');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ATTR_DESC', 'Welches Attribut enthält die Angabe des Benutzerlevel für einen neu synchronisierten Benutzer?');
         @define('PLUGIN_EVENT_EXTERNALAUTH_HOST', 'Ziel-Host');
         @define('PLUGIN_EVENT_EXTERNALAUTH_HOST_DESC', 'Auf welchem Server befindet sich die Authentifizierungsquelle');
         @define('PLUGIN_EVENT_EXTERNALAUTH_PORT', 'Ziel-Port');
@@ -22,7 +22,7 @@
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF', 'Chefredakteur');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR', 'Editor');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN', 'Administrator');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DENY', 'Deny Access');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DENY', 'Zugriff verbieten');
         break;
 
     case 'en':
@@ -165,6 +165,10 @@
                     switch($this->get_config('source')) {
                         case 'LDAP':
                         default:
+                            if (!function_exists('ldap_connect')) {
+                                return false;
+                            }
+                            
                             $port = $this->get_config('port');
                             if (!empty($port)) {
                                 $ds = ldap_connect($this->get_config('host'), $port);

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_externalauth serendipity_event_externalauth.php,1.3,1.4

[Justin A. <jba...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29190

Modified Files:
	serendipity_event_externalauth.php 
Log Message:
Code is now working, tested against OpenLDAP.  

German text needs to be fixed.  Additional languages need to be set up. 

Process for deleting users in LDAP server needs to be defined.

If user and password are valid in LDAP server
   if user has userlevel attribute
      set userlevel to value in attribute
   else
      set userlevel to default value (MAY BE DENY (-1))
   fi
   if userlevel is valid
      update user in SQL table or create user
   else
      invalidate SQL user
   fi
fi
return to standard auth process



Index: serendipity_event_externalauth.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth/serendipity_event_externalauth.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_event_externalauth.php	7 Jan 2005 12:11:09 -0000	1.3
+++ serendipity_event_externalauth.php	7 Jan 2005 15:28:47 -0000	1.4
@@ -8,6 +8,8 @@
         @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE_DESC', 'Wählen Sie die Quelle der externen Zugangsdaten');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL', 'Standard Benutzerlevel');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC', 'Wählen Sie den Standard-Benutzerlevel für einen neu hinzugefügten externen Benutzer');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ATTR', 'Benutzerlevel Attribute');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ATTR_DESC', 'Which Attribute contains the userlevel for a new external user?');
         @define('PLUGIN_EVENT_EXTERNALAUTH_HOST', 'Ziel-Host');
         @define('PLUGIN_EVENT_EXTERNALAUTH_HOST_DESC', 'Auf welchem Server befindet sich die Authentifizierungsquelle');
         @define('PLUGIN_EVENT_EXTERNALAUTH_PORT', 'Ziel-Port');
@@ -20,6 +22,7 @@
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF', 'Chefredakteur');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR', 'Editor');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN', 'Administrator');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DENY', 'Deny Access');
         break;
 
     case 'en':
@@ -29,7 +32,9 @@
         @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE', 'Source of external authentication');
         @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE_DESC', 'Select the source of your external user credentials');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL', 'Default userlevel');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC', 'Which is the default userlevel for a new external user');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC', 'Which is the default userlevel for a new external user, if there is no Userlevel Attribute?');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ATTR', 'Userlevel Attribute');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ATTR_DESC', 'Which Attribute contains the userlevel for a new external user?');
         @define('PLUGIN_EVENT_EXTERNALAUTH_HOST', 'Authentication host');
         @define('PLUGIN_EVENT_EXTERNALAUTH_HOST_DESC', 'Enter the location of the authentication host');
         @define('PLUGIN_EVENT_EXTERNALAUTH_PORT', 'Authentication host port');
@@ -42,6 +47,7 @@
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF', 'Chief');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR', 'Editor');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN', 'Administrator');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DENY', 'Deny Access');
         break;
 }
 
@@ -56,12 +62,12 @@
         $propbag->add('name',          PLUGIN_EVENT_EXTERNALAUTH_TITLE);
         $propbag->add('description',   PLUGIN_EVENT_EXTERNALAUTH_DESC);
         $propbag->add('stackable',     false);
-        $propbag->add('author',        'Garvin Hicking');
-        $propbag->add('version',       '1.0');
+        $propbag->add('author',        'Garvin Hicking/Justin Alcorn');
+        $propbag->add('version',       '1.1');
         $propbag->add('event_hooks',    array(
             'backend_auth' => true
         ));
-        $propbag->add('configuration', array('host', 'port', 'rdn', 'source', 'userlevel', 'firstlogin'));
+        $propbag->add('configuration', array('host', 'port', 'rdn', 'source', 'userlevel', 'ldap_userlevel_attr', 'firstlogin'));
     }
 
     function introspect_config_item($name, &$propbag)
@@ -116,12 +122,20 @@
                 $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC);
                 $propbag->add('default',     USERLEVEL_EDITOR);
                 $propbag->add('select_values', array(
-                                                PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN  => USERLEVEL_ADMIN,
-                                                PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF  => USERLEVEL_CHIEF,
-                                                PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR => USERLEVEL_EDITOR,
-
+                                                USERLEVEL_ADMIN => PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN, 
+                                                USERLEVEL_CHIEF => PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF,
+                                                USERLEVEL_EDITOR => PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR,
+                                                -1 => PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DENY
                 ));
                 break;
+
+            case 'ldap_userlevel_attr':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ATTR);
+                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ATTR_DESC);
+                $propbag->add('default',     'serendipity_userlevel');
+                break;
+
         }
         return true;
     }
@@ -130,7 +144,7 @@
         $title = PLUGIN_EVENT_EXTERNALAUTH_TITLE;
     }
 
-    function event_hook($event, &$bag, &$eventData) {
+    function event_hook($event, &$bag, &$eventData, &$addData) {
         global $serendipity;
 
         $hooks = &$bag->get('event_hooks');
@@ -139,9 +153,9 @@
                 case 'backend_auth':
                     $is_md5 =& $eventData;
                     if ($is_md5) {
-                        $md5_password = $password;
+                        $md5_password = $addData['password'];
                     } else {
-                        $md5_password = md5($password);
+                        $md5_password = md5($addData['password']);
                     }
 
                     if ($_SESSION['serendipityAuthedUser'] == true && serendipity_db_bool($this->get_config('firstlogin'))) {
@@ -151,10 +165,6 @@
                     switch($this->get_config('source')) {
                         case 'LDAP':
                         default:
-                            if (!function_exists('ldap_connect')) {
-                                return false;
-                            }
-
                             $port = $this->get_config('port');
                             if (!empty($port)) {
                                 $ds = ldap_connect($this->get_config('host'), $port);
@@ -178,7 +188,19 @@
 
                                          $this->get_config('rdn')
                                 );
-                                $valid = ldap_bind($ds, $rdn, $addData['password']);
+                                if ($valid = @ldap_bind($ds, $rdn, $addData['password'])) {
+                                    $srch="(objectclass=*)";
+                                    $attributes=array("objectclass","mail",$this->get_config('ldap_userlevel_attr'));
+                                    if ($res = @ldap_read($ds,$rdn,$srch,$attributes)) {
+                                        $e = ldap_first_entry($ds,$res);
+                                        $attr = ldap_get_attributes($ds,$e);
+                                        if ($attr[$this->get_config('ldap_userlevel_attr')]["count"] > 0) {
+                                            $valid_userlevel = $attr[$this->get_config('ldap_userlevel_attr')][0];
+                                        } else {
+                                            $valid_userlevel = $this->get_config('userlevel');
+                                        }
+                                    }
+                                } 
                                 ldap_close($ds);
                             } else {
                                 $valid = false;
@@ -187,18 +209,24 @@
                     }
 
                     if ($valid) {
-                        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
+                        if ($valid_userlevel > -1) {
+                            // If the ldap user exists and the password is correct, and the user has a valid userlevel OR the default userlevel is valid, 
+                            //    update the user's record or create it if it doesn't exist.
+                            serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
                                                  SET password = '" . serendipity_db_escape_string($md5_password) . "'
                                                WHERE username = '" . serendipity_db_escape_string($addData['username']) . "'");
-                        if (serendipity_db_affected_rows() == 0) {
-                            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}authors (username, password, email, mail_comments, mail_trackbacks, userlevel)
-                                                       VALUES ('". serendipity_db_escape_string($addData['username']) ."', '". serendipity_db_escape_string($md5_password) . "', '', 1, 1, " . $this->get_config('userlevel') . ")");
-                        }
-                    } else {
-                        // If an account is no longer valid in the external source we set the password to something unknown. We can't delete it because that would destroy article references.
-                        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
+                            if (serendipity_db_affected_rows() == 0) {
+                                serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}authors (username, password, email, mail_comments, mail_trackbacks, userlevel)
+                                                       VALUES ('". serendipity_db_escape_string($addData['username']) ."', '". serendipity_db_escape_string($md5_password) . "', '" . serendipity_db_escape_string($attr["mail"][0]) . "', 1, 1, " . $valid_userlevel . ")");
+                            }
+                        } else {
+                            // If the username and password are correct in the ldap server, but the userlevel is set to DENY, invalidate the SQL user.
+                            serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
                                                  SET password = '" . serendipity_db_escape_string(md5(time())) . "'
                                                WHERE username = '" . serendipity_db_escape_string($addData['username']) . "'");
+                        }
+                        // if account does not exist in ldap server, or password is incorrect, return silently
+                        // N.B. - this means that disabling a user in the LDAP server by changing the password will NOT disable the user in the SQL table.
                     }
 
                     return true;

[Php-blog-plugin-cvs] additional_plugins/serendipity_plugin_category_dhtml_menu serendipity_plugin_category_dhtml_menu.php,NONE,1.1

[Jackson M. <ja...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_plugin_category_dhtml_menu
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27664/serendipity_plugin_category_dhtml_menu

Added Files:
	serendipity_plugin_category_dhtml_menu.php 
Log Message:
Initial commit for serendipity_plugin_category_dhtml_menu.


--- NEW FILE: serendipity_plugin_category_dhtml_menu.php ---
<?php    
/**
 * @author Jackson Miller <doc...@ja...>
 * @license PHP
 * @package additional_plugins
 * @version $Id: serendipity_plugin_category_dhtml_menu.php,v 1.1 2005/01/07 15:19:22 jaxn Exp $
 */                                                                                              


/**
 * Provides a DHTML tree menu of serendipity categories.
 * As of this commit an example can be seen at http://jaxn.org/blog/
 * @see serendipity_plugin
 */ 
class serendipity_plugin_category_dhtml_menu extends serendipity_plugin {

    /**
     * Provides reflection for plugin management.
     * @param $propbag
     * @return void
     */
    function introspect(&$propbag)
    {
        $propbag->add('name',        'category tree menu');
        $propbag->add('description', 'DHTML category menu.  Requires PEAR::HTML_TreeMenu.');
        $propbag->add('configuration', array('title', 'expand_all'));

    }

    /**
     * Provides reflection for plugin configuration
     * @param $name
     * @param $propbag
     * @return bool
     */
    function introspect_config_item($name, &$propbag)
    {
        switch ($name) {
            case 'title':
                $propbag->add('type','string');
                $propbag->add('name','menu title');
                $propbag->add('description','leave blank for no title');
                break;
            case 'expand_all':
                $propbag->add('type','bool');
                $propbag->add('name','expand all');
                $propbag->add('description','for future use...');
                $propbag->add('default','false');
                break;
            case 'image_path':
                $propbag->add('type','string');
                $propbag->add('name','path to images');
                $propbag->add('description','the absolute (url) path to your images directory');
                break;
            cate 'script_path':
                $propbag->add('type','string');
                $propbag->add('name','path to HTMLTree.js');
                $propbag->add('description','the absolute (url) path to your HTMLTree.js (provided with PEAR::HTML_TreeMenu).');
                break;
            default:
               break;
        }
        
        return true;
    }

    /**
     * Creates a DHTML menu of serendipity categories.
     *
     * The menu is echoed out.
     *
     * @param  string $title  (Serves as the top level menu item if present)
     * @return void
     * @see    http://pear.php.net/HTML_TreeMenu  PEAR::HTML_TreeMenu
     */
    function generate_content(&$title) {
        
        global $serendipity;
        
        // may want to put this in bundled_libs or a sub directory of this directory
        require_once('HTML/TreeMenu.php');
        
        $which_category = $this->get_config('authorid');
        
        // build an accessible array of categories
        foreach (serendipity_fetchCategories(empty($which_category) ? 'all' : $which_category) as $cat) {
            $categories[$cat['categoryid']] = $cat;
        }
        
        // create nodes
        foreach ($categories as $category) {
            $cat_nodes[$category['categoryid']] = new HTML_TreeNode(array('text'=>$category[1],'link'=>'http://'.$_SERVER['HTTP_HOST'].$serendipity['serendipityHTTPPath'].'categories/'.$category[0].'-'.urlencode($category[1]).'/'));
        }
        
        // node for all categories
        $all_cats = new HTML_TreeNode(array('text'=>'all categories','link'=>'http://'.$_SERVER['HTTP_HOST'].$serendipity['serendipityHTTPPath'].$serendipity['indexFile']));
        
        // create a top level for "all categories"  
        // this serves as the title
        $cat_nodes[0] = new HTML_TreeNode(array('text'=>'<span class="serendipitySideBarTitle">'.$this->get_config('title', $title).'</span>'));
        
        // nest nodes (thanks to PHP references)
        foreach ($categories as $category) {
            $cat_nodes[$category['parentid']]->addItem($cat_nodes[$category['categoryid']]);
        }  

        // nest the "all categories" category
        $cat_nodes[0]->addItem($all_cats);        
        
        $menu = new HTML_TreeMenu();
        $menu->addItem( $cat_nodes[0] );
        
 
        $tree = new HTML_TreeMenu_DHTML($menu,array('images'=>$this->get_config('image_path')));
        $output = $tree->toHTML();

        echo '<script type="text/javascript" src="'.$this->get_config('script_path').'"></script>';
        echo $output;        
        
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>

[Php-blog-plugin-cvs] additional_plugins/serendipity_plugin_category_dhtml_menu - New directory

[Jackson M. <ja...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_plugin_category_dhtml_menu
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22201/serendipity_plugin_category_dhtml_menu

Log Message:
Directory /cvsroot/php-blog/additional_plugins/serendipity_plugin_category_dhtml_menu added to the repository

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_externalauth serendipity_event_externalauth.php,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16591/additional_plugins/serendipity_event_externalauth

Modified Files:
	serendipity_event_externalauth.php 
Log Message:
fix linebreaks


Index: serendipity_event_externalauth.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth/serendipity_event_externalauth.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_event_externalauth.php	6 Jan 2005 10:12:46 -0000	1.2
+++ serendipity_event_externalauth.php	7 Jan 2005 12:11:09 -0000	1.3
@@ -1,214 +1,218 @@
-<?php # $Id$
-
-switch ($serendipity['lang']) {
-    case 'de':
-        @define('PLUGIN_EVENT_EXTERNALAUTH_TITLE', 'Externe Benutzer-Authentifizierung (LDAP) [EXPERIMENTAL]');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_DESC', 'Ermöglicht die externe authentifizierung für Logins der Benutzer. Die Zugangsdaten werden im lokalen Serendipity Datenbank-Framework gecached.');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE', 'Authentifizierungs-Quelle');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE_DESC', 'Wählen Sie die Quelle der externen Zugangsdaten');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL', 'Standard Benutzerlevel');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC', 'Wählen Sie den Standard-Benutzerlevel für einen neu hinzugefügten externen Benutzer');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_HOST', 'Ziel-Host');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_HOST_DESC', 'Auf welchem Server befindet sich die Authentifizierungsquelle');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_PORT', 'Ziel-Port');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC', 'Verbindungs-Port der Authentifizierungsquelle. Ein leerer Wert nutzt den Standardport.');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_RDN', 'Authentifizierungsstring');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_RDN_DESC', 'String für die Authentifizierung. %1 wird durch den Benutzernamen, %2 durch das Passwort und %3 durch das MD5-kodierte Passwort ersetzt');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN', 'Externe Authentifizierung nur einmalig durchführen');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN_DESC', 'Soll die externe Authentifizierung nur einmal pro Session ausgeführt werden, oder bei jeder Anfrage? JA wird die Geschwindigkeit erhöhen, NEIN die Sicherheit.');
-
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF', 'Chefredakteur');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR', 'Editor');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN', 'Administrator');
-        break;
-
-    case 'en':
-    default:
-        @define('PLUGIN_EVENT_EXTERNALAUTH_TITLE', 'External user authentication (LDAP) [EXPERIMENTAL]');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_DESC', 'Allows to use external ressource to validate logins. Logins will be cached in the Serendipity database framework.');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE', 'Source of external authentication');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE_DESC', 'Select the source of your external user credentials');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL', 'Default userlevel');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC', 'Which is the default userlevel for a new external user');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_HOST', 'Authentication host');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_HOST_DESC', 'Enter the location of the authentication host');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_PORT', 'Authentication host port');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC', 'Enter the port of the authentication host. Empty value will use the default port');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_RDN', 'Authentication string');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_RDN_DESC', 'String used for authentication. %1 will be replaced by the username, %2 will contain the password and %3 the MD5-encoded password');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN', 'Only perform once per session');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN_DESC', 'Should the external auth only take place once for a whole session, or upon each request. TRUE will increase performance, FALSE will increase security.');
-
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF', 'Chief');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR', 'Editor');
-        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN', 'Administrator');
-        break;
-}
-
-class serendipity_event_externalauth extends serendipity_event
-{
-    var $title = PLUGIN_EVENT_EXTERNALAUTH_TITLE;
-
-    function introspect(&$propbag)
-    {
-        global $serendipity;
-
-        $propbag->add('name',          PLUGIN_EVENT_EXTERNALAUTH_TITLE);
-        $propbag->add('description',   PLUGIN_EVENT_EXTERNALAUTH_DESC);
-        $propbag->add('stackable',     false);
-        $propbag->add('author',        'Garvin Hicking');
-        $propbag->add('version',       '1.0');
-        $propbag->add('event_hooks',    array(
-            'backend_auth' => true
-        ));
-        $propbag->add('configuration', array('host', 'port', 'rdn', 'source', 'userlevel', 'firstlogin'));
-    }
-
-    function introspect_config_item($name, &$propbag)
-    {
-        switch($name) {
-            case 'firstlogin':
-                $propbag->add('type',        'boolean');
-                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN);
-                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN_DESC);
-                $propbag->add('default',     true);
-                break;
-
-            case 'rdn':
-                $propbag->add('type',        'string');
-                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_RDN);
-                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_RDN_DESC);
-                $propbag->add('default',     'uid=%1,ou=people,dc=yourdomain,dc=com');
-                break;
-
-            case 'port':
-                $propbag->add('type',        'string');
-                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_PORT);
-                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC);
-                $propbag->add('default',     '');
-                break;
-
-            case 'port':
-                $propbag->add('type',        'string');
-                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_PORT);
-                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC);
-                $propbag->add('default',     '');
-                break;
-
-            case 'host':
-                $propbag->add('type',        'string');
-                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_HOST);
-                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_HOST_DESC);
-                $propbag->add('default',     'localhost');
-                break;
-
-            case 'source':
-                $propbag->add('type',        'select');
-                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_SOURCE);
-                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_SOURCE_DESC);
-                $propbag->add('default',     'LDAP');
-                $propbag->add('select_values', array('LDAP' => 'LDAP'));
-                break;
-
-            case 'userlevel':
-                $propbag->add('type',        'select');
-                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL);
-                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC);
-                $propbag->add('default',     USERLEVEL_EDITOR);
-                $propbag->add('select_values', array(
-                                                PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN  => USERLEVEL_ADMIN,
-                                                PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF  => USERLEVEL_CHIEF,
-                                                PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR => USERLEVEL_EDITOR,
-
-                ));
-                break;
-        }
-        return true;
-    }
-
-    function generate_content(&$title) {
-        $title = PLUGIN_EVENT_EXTERNALAUTH_TITLE;
-    }
-
-    function event_hook($event, &$bag, &$eventData) {
-        global $serendipity;
-
-        $hooks = &$bag->get('event_hooks');
-        if (isset($hooks[$event])) {
-            switch($event) {
-                case 'backend_auth':
-                    $is_md5 =& $eventData;
-                    if ($is_md5) {
-                        $md5_password = $password;
-                    } else {
-                        $md5_password = md5($password);
-                    }
-
-                    if ($_SESSION['serendipityAuthedUser'] == true && serendipity_db_bool($this->get_config('firstlogin'))) {
-                        return true;
-                    }
-
-                    switch($this->get_config('source')) {
-                        case 'LDAP':
-                        default:
-                            $port = $this->get_config('port');
-                            if (!empty($port)) {
-                                $ds = ldap_connect($this->get_config('host'), $port);
-                            } else {
-                                $ds = ldap_connect($this->get_config('host'));
-                            }
-
-                            if ($ds) {
-                                $rdn = str_replace(
-                                         array(
-                                           '%1',
-                                           '%2',
-                                           '%3'
-                                         ),
-
-                                         array(
-                                           $addData['username'],
-                                           $addData['password'],
-                                           $md5_password
-                                         ),
-
-                                         $this->get_config('rdn')
-                                );
-                                $valid = ldap_bind($ds, $rdn, $addData['password']);
-                                ldap_close($ds);
-                            } else {
-                                $valid = false;
-                            }
-                            break;
-                    }
-
-                    if ($valid) {
-                        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
-                                                 SET password = '" . serendipity_db_escape_string($md5_password) . "'
-                                               WHERE username = '" . serendipity_db_escape_string($addData['username']) . "'");
-                        if (serendipity_db_affected_rows() == 0) {
-                            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}authors (username, password, email, mail_comments, mail_trackbacks, userlevel)
-                                                       VALUES ('". serendipity_db_escape_string($addData['username']) ."', '". serendipity_db_escape_string($md5_password) . "', '', 1, 1, " . $this->get_config('userlevel') . ")");
-                        }
-                    } else {
-                        // If an account is no longer valid in the external source we set the password to something unknown. We can't delete it because that would destroy article references.
-                        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
-                                                 SET password = '" . serendipity_db_escape_string(md5(time())) . "'
-                                               WHERE username = '" . serendipity_db_escape_string($addData['username']) . "'");
-                    }
-
-                    return true;
-                    break;
-
-                default:
-                    return false;
-                    break;
-            }
-        } else {
-            return false;
-        }
-    }
-}
-
-/* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+<?php # $Id$
+
+switch ($serendipity['lang']) {
+    case 'de':
+        @define('PLUGIN_EVENT_EXTERNALAUTH_TITLE', 'Externe Benutzer-Authentifizierung (LDAP) [EXPERIMENTAL]');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_DESC', 'Ermöglicht die externe authentifizierung für Logins der Benutzer. Die Zugangsdaten werden im lokalen Serendipity Datenbank-Framework gecached.');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE', 'Authentifizierungs-Quelle');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE_DESC', 'Wählen Sie die Quelle der externen Zugangsdaten');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL', 'Standard Benutzerlevel');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC', 'Wählen Sie den Standard-Benutzerlevel für einen neu hinzugefügten externen Benutzer');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_HOST', 'Ziel-Host');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_HOST_DESC', 'Auf welchem Server befindet sich die Authentifizierungsquelle');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_PORT', 'Ziel-Port');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC', 'Verbindungs-Port der Authentifizierungsquelle. Ein leerer Wert nutzt den Standardport.');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_RDN', 'Authentifizierungsstring');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_RDN_DESC', 'String für die Authentifizierung. %1 wird durch den Benutzernamen, %2 durch das Passwort und %3 durch das MD5-kodierte Passwort ersetzt');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN', 'Externe Authentifizierung nur einmalig durchführen');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN_DESC', 'Soll die externe Authentifizierung nur einmal pro Session ausgeführt werden, oder bei jeder Anfrage? JA wird die Geschwindigkeit erhöhen, NEIN die Sicherheit.');
+
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF', 'Chefredakteur');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR', 'Editor');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN', 'Administrator');
+        break;
+
+    case 'en':
+    default:
+        @define('PLUGIN_EVENT_EXTERNALAUTH_TITLE', 'External user authentication (LDAP) [EXPERIMENTAL]');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_DESC', 'Allows to use external ressource to validate logins. Logins will be cached in the Serendipity database framework.');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE', 'Source of external authentication');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE_DESC', 'Select the source of your external user credentials');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL', 'Default userlevel');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC', 'Which is the default userlevel for a new external user');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_HOST', 'Authentication host');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_HOST_DESC', 'Enter the location of the authentication host');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_PORT', 'Authentication host port');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC', 'Enter the port of the authentication host. Empty value will use the default port');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_RDN', 'Authentication string');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_RDN_DESC', 'String used for authentication. %1 will be replaced by the username, %2 will contain the password and %3 the MD5-encoded password');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN', 'Only perform once per session');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN_DESC', 'Should the external auth only take place once for a whole session, or upon each request. TRUE will increase performance, FALSE will increase security.');
+
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF', 'Chief');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR', 'Editor');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN', 'Administrator');
+        break;
+}
+
+class serendipity_event_externalauth extends serendipity_event
+{
+    var $title = PLUGIN_EVENT_EXTERNALAUTH_TITLE;
+
+    function introspect(&$propbag)
+    {
+        global $serendipity;
+
+        $propbag->add('name',          PLUGIN_EVENT_EXTERNALAUTH_TITLE);
+        $propbag->add('description',   PLUGIN_EVENT_EXTERNALAUTH_DESC);
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Garvin Hicking');
+        $propbag->add('version',       '1.0');
+        $propbag->add('event_hooks',    array(
+            'backend_auth' => true
+        ));
+        $propbag->add('configuration', array('host', 'port', 'rdn', 'source', 'userlevel', 'firstlogin'));
+    }
+
+    function introspect_config_item($name, &$propbag)
+    {
+        switch($name) {
+            case 'firstlogin':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN);
+                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN_DESC);
+                $propbag->add('default',     true);
+                break;
+
+            case 'rdn':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_RDN);
+                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_RDN_DESC);
+                $propbag->add('default',     'uid=%1,ou=people,dc=yourdomain,dc=com');
+                break;
+
+            case 'port':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_PORT);
+                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC);
+                $propbag->add('default',     '');
+                break;
+
+            case 'port':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_PORT);
+                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC);
+                $propbag->add('default',     '');
+                break;
+
+            case 'host':
+                $propbag->add('type',        'string');
+                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_HOST);
+                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_HOST_DESC);
+                $propbag->add('default',     'localhost');
+                break;
+
+            case 'source':
+                $propbag->add('type',        'select');
+                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_SOURCE);
+                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_SOURCE_DESC);
+                $propbag->add('default',     'LDAP');
+                $propbag->add('select_values', array('LDAP' => 'LDAP'));
+                break;
+
+            case 'userlevel':
+                $propbag->add('type',        'select');
+                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL);
+                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC);
+                $propbag->add('default',     USERLEVEL_EDITOR);
+                $propbag->add('select_values', array(
+                                                PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN  => USERLEVEL_ADMIN,
+                                                PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF  => USERLEVEL_CHIEF,
+                                                PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR => USERLEVEL_EDITOR,
+
+                ));
+                break;
+        }
+        return true;
+    }
+
+    function generate_content(&$title) {
+        $title = PLUGIN_EVENT_EXTERNALAUTH_TITLE;
+    }
+
+    function event_hook($event, &$bag, &$eventData) {
+        global $serendipity;
+
+        $hooks = &$bag->get('event_hooks');
+        if (isset($hooks[$event])) {
+            switch($event) {
+                case 'backend_auth':
+                    $is_md5 =& $eventData;
+                    if ($is_md5) {
+                        $md5_password = $password;
+                    } else {
+                        $md5_password = md5($password);
+                    }
+
+                    if ($_SESSION['serendipityAuthedUser'] == true && serendipity_db_bool($this->get_config('firstlogin'))) {
+                        return true;
+                    }
+
+                    switch($this->get_config('source')) {
+                        case 'LDAP':
+                        default:
+                            if (!function_exists('ldap_connect')) {
+                                return false;
+                            }
+
+                            $port = $this->get_config('port');
+                            if (!empty($port)) {
+                                $ds = ldap_connect($this->get_config('host'), $port);
+                            } else {
+                                $ds = ldap_connect($this->get_config('host'));
+                            }
+
+                            if ($ds) {
+                                $rdn = str_replace(
+                                         array(
+                                           '%1',
+                                           '%2',
+                                           '%3'
+                                         ),
+
+                                         array(
+                                           $addData['username'],
+                                           $addData['password'],
+                                           $md5_password
+                                         ),
+
+                                         $this->get_config('rdn')
+                                );
+                                $valid = ldap_bind($ds, $rdn, $addData['password']);
+                                ldap_close($ds);
+                            } else {
+                                $valid = false;
+                            }
+                            break;
+                    }
+
+                    if ($valid) {
+                        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
+                                                 SET password = '" . serendipity_db_escape_string($md5_password) . "'
+                                               WHERE username = '" . serendipity_db_escape_string($addData['username']) . "'");
+                        if (serendipity_db_affected_rows() == 0) {
+                            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}authors (username, password, email, mail_comments, mail_trackbacks, userlevel)
+                                                       VALUES ('". serendipity_db_escape_string($addData['username']) ."', '". serendipity_db_escape_string($md5_password) . "', '', 1, 1, " . $this->get_config('userlevel') . ")");
+                        }
+                    } else {
+                        // If an account is no longer valid in the external source we set the password to something unknown. We can't delete it because that would destroy article references.
+                        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
+                                                 SET password = '" . serendipity_db_escape_string(md5(time())) . "'
+                                               WHERE username = '" . serendipity_db_escape_string($addData['username']) . "'");
+                    }
+
+                    return true;
+                    break;
+
+                default:
+                    return false;
+                    break;
+            }
+        } else {
+            return false;
+        }
+    }
+}
+
+/* vim: set sts=4 ts=4 expandtab : */
+?>

[Php-blog-plugin-cvs] additional_plugins/serendipity_plugin_weather serendipity_plugin_weather.php,1.12,1.13

[Matthew G. <mgr...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_plugin_weather
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5456/serendipity_plugin_weather

Modified Files:
	serendipity_plugin_weather.php 
Log Message:
Fixed plugin failure due to missing PEAR/cache

Index: serendipity_plugin_weather.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_plugin_weather/serendipity_plugin_weather.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_plugin_weather.php	3 Jan 2005 02:59:42 -0000	1.12
+++ serendipity_plugin_weather.php	6 Jan 2005 20:41:45 -0000	1.13
@@ -43,6 +43,10 @@
    @define('PLUGIN_SIDEBAR_WEATHER_DATA_WNW', 'West/Northwest');  //Translate
    @define('PLUGIN_SIDEBAR_WEATHER_DATA_WSW', 'West/Southwest');  //Translate
    @define('PLUGIN_SIDEBAR_WEATHER_DATA_V', 'Variable');          //Translate
+   @define('PLUGIN_SIDEBAR_WEATHER_CACHE_ENTRIES', 'Cache weather information?');  //Translate
+   @define('PLUGIN_SIDEBAR_WEATHER_CACHE_ENTRIES_DESC', 'Must have PEAR:Cache installed.');  //Translate
+   @define('PLUGIN_SIDEBAR_WEATHER_CACHE_DIRECTORY', 'Directory for cache information:');  //Translate
+   @define('PLUGIN_SIDEBAR_WEATHER_CACHE_DIRECTORY_DESC', 'Server must have read and write permissions to this directory.');  //Translate
    break;
  case 'en':
  default:
@@ -85,6 +89,10 @@
    @define('PLUGIN_SIDEBAR_WEATHER_DATA_WNW', 'West/Northwest');
    @define('PLUGIN_SIDEBAR_WEATHER_DATA_WSW', 'West/Southwest');
    @define('PLUGIN_SIDEBAR_WEATHER_DATA_V', 'Variable');
+   @define('PLUGIN_SIDEBAR_WEATHER_CACHE_ENTRIES', 'Cache weather information?');
+   @define('PLUGIN_SIDEBAR_WEATHER_CACHE_ENTRIES_DESC', 'Must have PEAR:Cache installed.');
+   @define('PLUGIN_SIDEBAR_WEATHER_CACHE_DIRECTORY', 'Directory for cache information:');
+   @define('PLUGIN_SIDEBAR_WEATHER_CACHE_DIRECTORY_DESC', 'Server must have read and write permissions to this directory.');
    break;
  } // switch
 
@@ -104,6 +112,8 @@
     $propbag->add('configuration', array('title',
 					 'metar', 
 					 'timezone',
+					 'caching',
+                               'cache_directory',
 					 'units'));
   } // function
     /**
@@ -142,6 +152,22 @@
       $propbag->add('description', PLUGIN_SIDEBAR_WEATHER_UNITS_BLAHBLAH);
       $propbag->add('select_values', $select);
       break;
+
+    case 'caching':
+      $propbag->add('type', 'boolean');
+      $propbag->add('name', PLUGIN_SIDEBAR_WEATHER_CACHE_ENTRIES);
+      $propbag->add('description', PLUGIN_SIDEBAR_WEATHER_CACHE_ENTRIES_DESC);
+      $propbag->add('default', false);
+      break;
+
+    case 'cache_directory':
+      $propbag->add('type', 'string');
+      $propbag->add('name', PLUGIN_SIDEBAR_WEATHER_CACHE_DIRECTORY);
+      $propbag->add('description', PLUGIN_SIDEBAR_WEATHER_CACHE_DIRECTORY_DESC);
+      $propbag->add('default', '/tmp');
+      break;
+
+
     default:
       return false;
     } // switch
@@ -161,8 +187,10 @@
     $metar_site = $this->get_config('metar','EDDK');
     $timezone = $this->get_config('timezone',0);
     $unitString = $this->get_config('units','metric');
+    $caching = $this->get_config('caching',0);
+    $directory = $this->get_config('cache_directory','/tmp');
     
-    if(include_once('Services/Weather.php')){
+    if(@include_once('Services/Weather.php')){
 
         $metar = &Services_Weather::service('METAR', array('debug' => 0));
         if (Services_Weather::isError($metar)) {
@@ -177,7 +205,14 @@
         // $metar->setDateTimeFormat('d.m.Y', 'H:i');
         //    $metar_data->setDateTimeFormat('j M Y', 'H:i');
     
-        $status = $metar->setCache('file', array('cache_dir' => $serendipity['serendipityPath'].'/templates_c'));
+        if($caching){
+            if (@include_once("Cache.php")) {
+                $status = $metar->setCache('file', array('cache_dir' => $serendipity['serendipityPath'].$directory));
+            } else {
+                echo 'Caching is enabled but PEAR:Cache does not seem to be installed.';
+            }
+        }
+
         if (Services_Weather::isError($status)) {
           echo 'Error: ' . $status->getMessage();
         }

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_usergallery serendipity_event_usergallery.php,NONE,1.1

[Matthew G. <mgr...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_usergallery
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25745/serendipity_event_usergallery

Added Files:
	serendipity_event_usergallery.php 
Log Message:
A user viewable display of the media list.

--- NEW FILE: serendipity_event_usergallery.php ---
<?php 

switch ($serendipity['lang']) {
    case 'de':
    case 'en':
    case 'es':
    default:
        @define('PLUGIN_EVENT_USERGALLERY_TITLE', 'Gallery Display');
        @define('PLUGIN_EVENT_USERGALLERY_DESC', 'Allows anonymous users to view gallery links');
        break;
}

class serendipity_event_usergallery extends serendipity_event
{
    var $title = PLUGIN_EVENT_USERGALLERY_TITLE;

    function introspect(&$propbag)
    {
        global $serendipity;

        $propbag->add('name',          PLUGIN_EVENT_USERGALLERY_TITLE);
        $propbag->add('description',   PLUGIN_EVENT_USERGALLERY_DESC);
        $propbag->add('stackable',     false);
        $propbag->add('author',        'Matthew Groeninger');
        $propbag->add('version',       '0.2');
        $propbag->add('event_hooks',    array(
            'entry_display'      => true,
            'entries_header'      => true,
        ));
    }

    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;

        $hooks = &$bag->get('event_hooks');
        if (isset($hooks[$event])) {
            switch($event) {
                case 'entries_header':
                    if ($serendipity['GET']['subpage'] == 'gallery') {
                        $this->generate_content($title);
                    }
                    return true;
                    break;

                case 'entry_display':
                    if ($serendipity['GET']['subpage'] == 'gallery') {
                        $eventData['clean_page'] = true; // This is important to not display an entry list!
                    }
                    return true;
                    break;
            }
       }
    }

    function generate_content(&$title) {
        global $serendipity;
        echo '<div class="serendipity_Entry_Date"><div class="serendipity_entry">';
        if (isset($serendipity['GET']['image']))
        {
          $this->displayImage($serendipity['GET']['image']);
        } else {
            $title = PLUGIN_EVENT_USERGALLERY_TITLE;
            $add_url = '?serendipity[subpage]=gallery';
            serendipity_displayImageList(
                isset($serendipity['GET']['page'])   ? $serendipity['GET']['page']   : 1,
                2,
                false,
                $add_url,
                false
            );
        }
        echo '</div></div>';
    }

    function displayImage($id) {
          global $serendipity;
          $file = serendipity_fetchImageFromDatabase($id);
          $file['link'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['extension'];
          echo '<h3>'. $file['name'] .'</h3>';
          $show .= '<img src="' . $file['link'] . '" border="0" alt="'. $file['name'] . '" />';
          echo $show;

    }
}
/* vim: set sts=4 ts=4 expandtab : */

?>

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_usergallery - New directory

[Matthew G. <mgr...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_usergallery
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25374/serendipity_event_usergallery

Log Message:
Directory /cvsroot/php-blog/additional_plugins/serendipity_event_usergallery added to the repository

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_externalauth serendipity_event_externalauth.php,1.1,1.2

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26546/serendipity_event_externalauth

Modified Files:
	serendipity_event_externalauth.php 
Log Message:
add firstlogin directive


Index: serendipity_event_externalauth.php
===================================================================
RCS file: /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth/serendipity_event_externalauth.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_event_externalauth.php	6 Jan 2005 10:00:31 -0000	1.1
+++ serendipity_event_externalauth.php	6 Jan 2005 10:12:46 -0000	1.2
@@ -14,6 +14,8 @@
         @define('PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC', 'Verbindungs-Port der Authentifizierungsquelle. Ein leerer Wert nutzt den Standardport.');
         @define('PLUGIN_EVENT_EXTERNALAUTH_RDN', 'Authentifizierungsstring');
         @define('PLUGIN_EVENT_EXTERNALAUTH_RDN_DESC', 'String für die Authentifizierung. %1 wird durch den Benutzernamen, %2 durch das Passwort und %3 durch das MD5-kodierte Passwort ersetzt');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN', 'Externe Authentifizierung nur einmalig durchführen');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN_DESC', 'Soll die externe Authentifizierung nur einmal pro Session ausgeführt werden, oder bei jeder Anfrage? JA wird die Geschwindigkeit erhöhen, NEIN die Sicherheit.');
 
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF', 'Chefredakteur');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR', 'Editor');
@@ -34,6 +36,8 @@
         @define('PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC', 'Enter the port of the authentication host. Empty value will use the default port');
         @define('PLUGIN_EVENT_EXTERNALAUTH_RDN', 'Authentication string');
         @define('PLUGIN_EVENT_EXTERNALAUTH_RDN_DESC', 'String used for authentication. %1 will be replaced by the username, %2 will contain the password and %3 the MD5-encoded password');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN', 'Only perform once per session');
+        @define('PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN_DESC', 'Should the external auth only take place once for a whole session, or upon each request. TRUE will increase performance, FALSE will increase security.');
 
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF', 'Chief');
         @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR', 'Editor');
@@ -57,12 +61,19 @@
         $propbag->add('event_hooks',    array(
             'backend_auth' => true
         ));
-        $propbag->add('configuration', array('host', 'port', 'rdn', 'source', 'userlevel'));
+        $propbag->add('configuration', array('host', 'port', 'rdn', 'source', 'userlevel', 'firstlogin'));
     }
 
     function introspect_config_item($name, &$propbag)
     {
         switch($name) {
+            case 'firstlogin':
+                $propbag->add('type',        'boolean');
+                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN);
+                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_FIRSTLOGIN_DESC);
+                $propbag->add('default',     true);
+                break;
+
             case 'rdn':
                 $propbag->add('type',        'string');
                 $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_RDN);
@@ -133,6 +144,10 @@
                         $md5_password = md5($password);
                     }
 
+                    if ($_SESSION['serendipityAuthedUser'] == true && serendipity_db_bool($this->get_config('firstlogin'))) {
+                        return true;
+                    }
+
                     switch($this->get_config('source')) {
                         case 'LDAP':
                         default:

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_externalauth serendipity_event_externalauth.php,NONE,1.1

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23758

Added Files:
	serendipity_event_externalauth.php 
Log Message:
external auth test


--- NEW FILE: serendipity_event_externalauth.php ---
<?php # $Id: serendipity_event_externalauth.php,v 1.1 2005/01/06 10:00:31 garvinhicking Exp $

switch ($serendipity['lang']) {
    case 'de':
        @define('PLUGIN_EVENT_EXTERNALAUTH_TITLE', 'Externe Benutzer-Authentifizierung (LDAP) [EXPERIMENTAL]');
        @define('PLUGIN_EVENT_EXTERNALAUTH_DESC', 'Ermöglicht die externe authentifizierung für Logins der Benutzer. Die Zugangsdaten werden im lokalen Serendipity Datenbank-Framework gecached.');
        @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE', 'Authentifizierungs-Quelle');
        @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE_DESC', 'Wählen Sie die Quelle der externen Zugangsdaten');
        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL', 'Standard Benutzerlevel');
        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC', 'Wählen Sie den Standard-Benutzerlevel für einen neu hinzugefügten externen Benutzer');
        @define('PLUGIN_EVENT_EXTERNALAUTH_HOST', 'Ziel-Host');
        @define('PLUGIN_EVENT_EXTERNALAUTH_HOST_DESC', 'Auf welchem Server befindet sich die Authentifizierungsquelle');
        @define('PLUGIN_EVENT_EXTERNALAUTH_PORT', 'Ziel-Port');
        @define('PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC', 'Verbindungs-Port der Authentifizierungsquelle. Ein leerer Wert nutzt den Standardport.');
        @define('PLUGIN_EVENT_EXTERNALAUTH_RDN', 'Authentifizierungsstring');
        @define('PLUGIN_EVENT_EXTERNALAUTH_RDN_DESC', 'String für die Authentifizierung. %1 wird durch den Benutzernamen, %2 durch das Passwort und %3 durch das MD5-kodierte Passwort ersetzt');

        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF', 'Chefredakteur');
        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR', 'Editor');
        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN', 'Administrator');
        break;

    case 'en':
    default:
        @define('PLUGIN_EVENT_EXTERNALAUTH_TITLE', 'External user authentication (LDAP) [EXPERIMENTAL]');
        @define('PLUGIN_EVENT_EXTERNALAUTH_DESC', 'Allows to use external ressource to validate logins. Logins will be cached in the Serendipity database framework.');
        @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE', 'Source of external authentication');
        @define('PLUGIN_EVENT_EXTERNALAUTH_SOURCE_DESC', 'Select the source of your external user credentials');
        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL', 'Default userlevel');
        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC', 'Which is the default userlevel for a new external user');
        @define('PLUGIN_EVENT_EXTERNALAUTH_HOST', 'Authentication host');
        @define('PLUGIN_EVENT_EXTERNALAUTH_HOST_DESC', 'Enter the location of the authentication host');
        @define('PLUGIN_EVENT_EXTERNALAUTH_PORT', 'Authentication host port');
        @define('PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC', 'Enter the port of the authentication host. Empty value will use the default port');
        @define('PLUGIN_EVENT_EXTERNALAUTH_RDN', 'Authentication string');
        @define('PLUGIN_EVENT_EXTERNALAUTH_RDN_DESC', 'String used for authentication. %1 will be replaced by the username, %2 will contain the password and %3 the MD5-encoded password');

        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF', 'Chief');
        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR', 'Editor');
        @define('PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN', 'Administrator');
        break;
}

class serendipity_event_externalauth extends serendipity_event
{
    var $title = PLUGIN_EVENT_EXTERNALAUTH_TITLE;

    function introspect(&$propbag)
    {
        global $serendipity;

        $propbag->add('name',          PLUGIN_EVENT_EXTERNALAUTH_TITLE);
        $propbag->add('description',   PLUGIN_EVENT_EXTERNALAUTH_DESC);
        $propbag->add('stackable',     false);
        $propbag->add('author',        'Garvin Hicking');
        $propbag->add('version',       '1.0');
        $propbag->add('event_hooks',    array(
            'backend_auth' => true
        ));
        $propbag->add('configuration', array('host', 'port', 'rdn', 'source', 'userlevel'));
    }

    function introspect_config_item($name, &$propbag)
    {
        switch($name) {
            case 'rdn':
                $propbag->add('type',        'string');
                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_RDN);
                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_RDN_DESC);
                $propbag->add('default',     'uid=%1,ou=people,dc=yourdomain,dc=com');
                break;

            case 'port':
                $propbag->add('type',        'string');
                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_PORT);
                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC);
                $propbag->add('default',     '');
                break;

            case 'port':
                $propbag->add('type',        'string');
                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_PORT);
                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_PORT_DESC);
                $propbag->add('default',     '');
                break;

            case 'host':
                $propbag->add('type',        'string');
                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_HOST);
                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_HOST_DESC);
                $propbag->add('default',     'localhost');
                break;

            case 'source':
                $propbag->add('type',        'select');
                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_SOURCE);
                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_SOURCE_DESC);
                $propbag->add('default',     'LDAP');
                $propbag->add('select_values', array('LDAP' => 'LDAP'));
                break;

            case 'userlevel':
                $propbag->add('type',        'select');
                $propbag->add('name',        PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL);
                $propbag->add('description', PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_DESC);
                $propbag->add('default',     USERLEVEL_EDITOR);
                $propbag->add('select_values', array(
                                                PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_ADMIN  => USERLEVEL_ADMIN,
                                                PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_CHIEF  => USERLEVEL_CHIEF,
                                                PLUGIN_EVENT_EXTERNALAUTH_USERLEVEL_EDITOR => USERLEVEL_EDITOR,

                ));
                break;
        }
        return true;
    }

    function generate_content(&$title) {
        $title = PLUGIN_EVENT_EXTERNALAUTH_TITLE;
    }

    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;

        $hooks = &$bag->get('event_hooks');
        if (isset($hooks[$event])) {
            switch($event) {
                case 'backend_auth':
                    $is_md5 =& $eventData;
                    if ($is_md5) {
                        $md5_password = $password;
                    } else {
                        $md5_password = md5($password);
                    }

                    switch($this->get_config('source')) {
                        case 'LDAP':
                        default:
                            $port = $this->get_config('port');
                            if (!empty($port)) {
                                $ds = ldap_connect($this->get_config('host'), $port);
                            } else {
                                $ds = ldap_connect($this->get_config('host'));
                            }

                            if ($ds) {
                                $rdn = str_replace(
                                         array(
                                           '%1',
                                           '%2',
                                           '%3'
                                         ),

                                         array(
                                           $addData['username'],
                                           $addData['password'],
                                           $md5_password
                                         ),

                                         $this->get_config('rdn')
                                );
                                $valid = ldap_bind($ds, $rdn, $addData['password']);
                                ldap_close($ds);
                            } else {
                                $valid = false;
                            }
                            break;
                    }

                    if ($valid) {
                        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
                                                 SET password = '" . serendipity_db_escape_string($md5_password) . "'
                                               WHERE username = '" . serendipity_db_escape_string($addData['username']) . "'");
                        if (serendipity_db_affected_rows() == 0) {
                            serendipity_db_query("INSERT INTO {$serendipity['dbPrefix']}authors (username, password, email, mail_comments, mail_trackbacks, userlevel)
                                                       VALUES ('". serendipity_db_escape_string($addData['username']) ."', '". serendipity_db_escape_string($md5_password) . "', '', 1, 1, " . $this->get_config('userlevel') . ")");
                        }
                    } else {
                        // If an account is no longer valid in the external source we set the password to something unknown. We can't delete it because that would destroy article references.
                        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors
                                                 SET password = '" . serendipity_db_escape_string(md5(time())) . "'
                                               WHERE username = '" . serendipity_db_escape_string($addData['username']) . "'");
                    }

                    return true;
                    break;

                default:
                    return false;
                    break;
            }
        } else {
            return false;
        }
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_externalauth - New directory

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23563/serendipity_event_externalauth

Log Message:
Directory /cvsroot/php-blog/additional_plugins/serendipity_event_externalauth added to the repository

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_deletelink serendipity_event_deletelink.php,NONE,1.1

[Riken <ri...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_deletelink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13184/serendipity_event_deletelink

Added Files:
	serendipity_event_deletelink.php 
Log Message:
Adding Deletelink plugin to repository

--- NEW FILE: serendipity_event_deletelink.php ---
<?php

switch ($serendipity['lang']) {
    default:
        @define('PLUGIN_EVENT_DELETELINK_NAME', 'Delete Link');
        @define('PLUGIN_EVENT_DELETELINK_BLAHBLAH', 'Adds a delete link to the footer of each entry.');
        @define('PLUGIN_EVENT_DELETELINK_TEXT', 'Delete entry');

        break;
}

class serendipity_event_deletelink extends serendipity_event
{

    function introspect(&$propbag)
    {
        global $serendipity;

        $propbag->add('name',          PLUGIN_EVENT_DELETELINK_NAME);
        $propbag->add('description',   PLUGIN_EVENT_DELETELINK_BLAHBLAH);
        $propbag->add('event_hooks', array('entry_display' => true));
    }

    function generate_content(&$title)
    {
        $title       = PLUGIN_EVENT_DELETELINK_NAME;
    }

    function event_hook($event, &$bag, &$eventData, $addData = null) {
        global $serendipity;

        $hooks = &$bag->get('event_hooks');

        if (isset($hooks[$event])) {
            switch($event) {
                case 'entry_display':
                    $elements = count($eventData);
                    for ($i = 0; $i < $elements; $i++) {
                        if ($_SESSION['serendipityAuthedUser'] === true && ($_SESSION['serendipityUserlevel'] >= USERLEVEL_CHIEF || $_SESSION['serendipityAuthorid'] == $eventData[$i]['authorid'])) {
                            $eventData[$i]['add_footer'] .= ' | ';
                            $eventData[$i]['add_footer'] .= '<a href="' . $serendipity['baseURL'] . 'serendipity_entries.php?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=delete&amp;serendipity[id]=' . $eventData[$i]['id'] . '">';
                            $eventData[$i]['add_footer'] .= PLUGIN_EVENT_DELETELINK_TEXT;
                            $eventData[$i]['add_footer'] .= '</a>';
                        }
                    }
                    return true;
                    break;

                default:
                    return false;
            }
        } else {
            return false;
        }
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>

[Php-blog-plugin-cvs] additional_plugins/serendipity_plugin_photoblog serendipity_plugin_photoblog.php,NONE,1.1

[Riken <ri...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_plugin_photoblog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12884/serendipity_plugin_photoblog

Added Files:
	serendipity_plugin_photoblog.php 
Log Message:
Adding Photoblog plugins to repository

--- NEW FILE: serendipity_plugin_photoblog.php ---
<?php

switch ($serendipity['lang']) {
    default:
        @define('PLUGIN_PHOTOBLOG_TITLE', 'Photoblog Entries');
        @define('PLUGIN_PHOTOBLOG_BLAHBLAH', 'Shows the thumbnails of the most recent photoblog entries');
        @define('PLUGIN_PHOTOBLOG_NUMBER', 'Number of entries');
        @define('PLUGIN_PHOTOBLOG_NUMBER_BLAHBLAH', 'How many entries should be displayed? (Default: 5)');

        break;
}

class serendipity_plugin_photoblog extends serendipity_plugin {

    function introspect(&$propbag) {
        $propbag->add('name',        PLUGIN_PHOTOBLOG_TITLE);
        $propbag->add('description', PLUGIN_PHOTOBLOG_BLAHBLAH);
        $propbag->add('configuration', array('number'));
    }

    function introspect_config_item($name, &$propbag) {
        switch($name) {
            case 'number':
                $propbag->add('type', 'string');
                $propbag->add('name', PLUGIN_PHOTOBLOG_NUMBER);
                $propbag->add('description', PLUGIN_PHOTOBLOG_NUMBER_BLAHBLAH);
                $propbag->add('default', 5);
                break;

            default:
                return false;
        }
        return true;
    }
    
    function getPhoto($entryid) {
        global $serendipity;
        $q = "SELECT * FROM {$serendipity['dbPrefix']}photoblog WHERE entryid=" . (int)$entryid;
        $row = serendipity_db_query($q, true);
        
        if (!isset($row) || !is_array($row)) {
            $row = null;
        }
        
        return $row;
    }

    function generate_content(&$title) {
        global $serendipity;

        $number     = $this->get_config('number');

        if (!$number || !is_numeric($number) || $number < 1) {
            $number = 5;
        }

        $title = PLUGIN_PHOTOBLOG_TITLE;
        
        if (!isset($serendipity['GET']['id']) || !is_numeric($serendipity['GET']['id'])) {
            $number = $number * $number + 1;
            $entries = serendipity_db_query("SELECT id,
                                                title,
                                                timestamp
                                           FROM {$serendipity['dbPrefix']}entries
                                          WHERE isdraft = 'false'
                                       ORDER BY timestamp DESC
                                          LIMIT $number");
        } else {
            $id = serendipity_db_escape_string($serendipity['GET']['id']);
            $entries1 = serendipity_db_query("SELECT id,
                                                title,
                                                timestamp
                                           FROM {$serendipity['dbPrefix']}entries
                                          WHERE isdraft = 'false'
                                            AND id > $id
                                       ORDER BY timestamp ASC
                                          LIMIT $number");
            $number++;
            $entries2 = serendipity_db_query("SELECT id,
                                                title,
                                                timestamp
                                           FROM {$serendipity['dbPrefix']}entries
                                          WHERE isdraft = 'false'
                                            AND id <= $id
                                       ORDER BY timestamp DESC
                                          LIMIT $number");
            if (isset($entries1) && is_array($entries1) && isset($entries2) && is_array($entries2)) {
                $entries = array_merge(array_reverse($entries1), $entries2);
            } elseif (isset($entries1) && is_array($entries1)) {
                $entries = array_reverse($entries1);
            } elseif (isset($entries2) && is_array($entries2)) {
                $entries = $entries2;
            }
        }
        
        if (isset($entries) && is_array($entries)) {
            
            foreach ($entries as $k => $entry) {
                $entryLink = serendipity_archiveURL(
                               $entry['id'],
                               $entry['title'],
                               'serendipityHTTPPath'
                            );
                $photo = $this->getPhoto($entry['id']);
                if (isset($photo)) {
                    $file = serendipity_fetchImageFromDatabase($photo['photoid']);
                    $imgsrc= $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] .'.'. $file['extension'];
                    $thumbbasename = $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
                    $thumbName     = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $thumbbasename;
                    $thumbsize     = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $thumbbasename);
                }

                echo '<a href="' . $entryLink . '" title="' . htmlspecialchars($entry['title']) . '">';
                if (isset($photo)) {
                    echo '<img style="margin:5px;" src="' . $imgsrc . '" width=' . $thumbsize[0] . ' height=' . $thumbsize[1];
                    if (isset($id) && ($id == $entry['id'])) {
                        echo ' border=4';
                    }
                    echo ' />';
                } else {
                    if (isset($id) && ($id == $entry['id'])) {
                        echo '<b>';
                    }
                    echo $entry['title'];
                    if (isset($id) && ($id == $entry['id'])) {
                        echo '</b>';
                    }
                }
                echo '</a><br />';
            }
        }
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_thumbnails serendipity_event_thumbnails.php,NONE,1.1

[Riken <ri...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_thumbnails
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12884/serendipity_event_thumbnails

Added Files:
	serendipity_event_thumbnails.php 
Log Message:
Adding Photoblog plugins to repository

--- NEW FILE: serendipity_event_thumbnails.php ---
<?php

switch ($serendipity['lang']) {
    default:
		@define('THUMBPAGE_TITLE', 'Thumbnail Page');
        @define('THUMBPAGE_TITLE_BLAHBLAH', 'Shows a thumbnail page');

		break;
}

class serendipity_event_thumbnails extends serendipity_event {
	function introspect(&$propbag) {
		global $serendipity;

		$propbag->add('name', THUMBPAGE_TITLE);
		$propbag->add('description', THUMBPAGE_TITLE_BLAHBLAH);
		$propbag->add('event_hooks',  array('entry_display' => true));

	}
	
	function getPhoto($entryid) {
        global $serendipity;
        $q = "SELECT * FROM {$serendipity['dbPrefix']}photoblog WHERE entryid=" . (int)$entryid;
        $row = serendipity_db_query($q, true);
        
        if (!isset($row) || !is_array($row)) {
            $row = null;
        }
        
        return $row;
    }


    function generate_content(&$title) {
        global $serendipity;
	
		$title = THUMBPAGE_TITLE;
		
		$entries = serendipity_db_query("SELECT id,
                                                title,
                                                timestamp
                                           FROM {$serendipity['dbPrefix']}entries
                                          WHERE isdraft = 'false'
                                       ORDER BY timestamp DESC");

        if (isset($entries) && is_array($entries)) {
            $count = 0;
            echo "<table><tr>";
            foreach ($entries as $k => $entry) {
                echo "<td align=center>";
                $entryLink = serendipity_archiveURL(
                               $entry['id'],
                               $entry['title'],
                               'serendipityHTTPPath'
                            );
                $photo = $this->getPhoto($entry['id']);
                if (isset($photo)) {
                    $file = serendipity_fetchImageFromDatabase($photo['photoid']);
                    $imgsrc= $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] .'.'. $file['extension'];
                    $thumbbasename = $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
                    $thumbName     = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $thumbbasename;
                    $thumbsize     = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $thumbbasename);
                }

                echo '<a href="' . $entryLink . '" title="' . htmlspecialchars($entry['title']) . '">';
                if (isset($photo)) {
                    echo '<img style="margin:5px;" src="' . $imgsrc . '" width=' . $thumbsize[0] . ' height=' . $thumbsize[1];
                    if (isset($id) && ($id == $entry['id'])) {
                        echo ' border=4';
                    }
                    echo ' />';
                } else {
                    if (isset($id) && ($id == $entry['id'])) {
                        echo '<b>';
                    }
                    echo $entry['title'];
                    if (isset($id) && ($id == $entry['id'])) {
                        echo '</b>';
                    }
                }
                echo '</a></td>';
                if ($count++ >= 6)
                {
                    $count = 0;
                    echo "</tr><tr>";
                }
            }
            echo "</tr></table>";
        }

#		if ($this->get_config('articleformat') == TRUE) {
#			echo '<div class="serendipity_Entry_Date"><div class="serendipity_entry">';
#		}
#		echo '<h4 class="serendipity_title">' . $this->get_config('headline') . '</h4>';
#		if ($this->get_config('markup') == TRUE) {
#			$entry = array('body' => $this->get_config('content')); 
#            serendipity_plugin_api::hook_event('frontend_display', $entry); 
#            echo $entry['body'];
#        } else {
#            echo $this->get_config('content');
#        }
#		if ($this->get_config('articleformat') == TRUE) {
#			echo '</div></div>';
#		}
	}

	function event_hook($event, &$bag, &$eventData, $addData = null) {
		global $serendipity;

		$hooks = &$bag->get('event_hooks');

		if (isset($hooks[$event])) {
		switch($event) {
			case 'entry_display':
				if ($serendipity['GET']['page'] == 'thumbs') {
					$title = '';
					$this->generate_content($title);
					$eventData['clean_page'] = true; // This is important to not display an entry list!
				}
				return true;
				break;
			default:
				return false;
				break;
			}
		} else {
			return false;
		}
	}
}
/* vim: set sts=4 ts=4 expandtab : */
?>

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_photoblog serendipity_event_photoblog.php,NONE,1.1

[Riken <ri...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_photoblog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12884/serendipity_event_photoblog

Added Files:
	serendipity_event_photoblog.php 
Log Message:
Adding Photoblog plugins to repository

--- NEW FILE: serendipity_event_photoblog.php ---
<?php

switch ($serendipity['lang']) {
    default:
        @define('PLUGIN_EVENT_PHOTOBLOG_TITLE', 'Photoblog Entries');
        @define('PLUGIN_EVENT_PHOTOBLOG_DESC', 'Adds a single image to an entry.');
        @define('PLUGIN_EVENT_PHOTOBLOG_VERSION', '1.0');
        @define('PLUGIN_EVENT_PHOTOBLOG_SELECTPHOTO', 'Select a photo to include in this entry:');
        break;
}

class serendipity_event_photoblog extends serendipity_event
{
    var $title = PLUGIN_EVENT_PHOTOBLOG_TITLE;

    function introspect(&$propbag)
    {
        global $serendipity;

        $propbag->add('name',          PLUGIN_EVENT_PHOTOBLOG_TITLE);
        $propbag->add('description',   PLUGIN_EVENT_PHOTOBLOG_DESC);
        $propbag->add('author',        'Cameron MacFarland');
        $propbag->add('event_hooks',    array(
#            'backend_publish'                                   => true,
            'backend_display'                                   => true,
            'frontend_display'                                  => true,
            'entry_display'                                     => true
        ));
        
        $this->supported_properties = array('photoname');
    }
    
    function generate_content(&$title) {
        $title = $this->title;
    }
    
    function checkScheme() {
        global $serendipity;

        $version = $this->get_config('version', '0.9');
        
        if ($version != PLUGIN_EVENT_PHOTOBLOG_VERSION) {
            $q   = "CREATE TABLE {$serendipity['dbPrefix']}photoblog (
                        entryid int(11) default null,
                        photoid int(11) default null
                    )";
            $sql = serendipity_db_schema_import($q);

            $q   = "CREATE INDEX kentryid ON {$serendipity['dbPrefix']}photoblog (entryid);";
            $sql = serendipity_db_schema_import($q);
            $this->set_config('version', PLUGIN_EVENT_PHOTOBLOG_VERSION);
        }
    }
    
    function addPhoto($entryid, $photoid) {
        global $serendipity;
        $q = "INSERT INTO {$serendipity['dbPrefix']}photoblog (entryid, photoid) VALUES (" . (int)$entryid . ", " . (int)$photoid . ")";
        serendipity_db_query($q);
    }
    
    function updatePhoto($entryid, $photoid) {
        global $serendipity;
        $q = "UPDATE {$serendipity['dbPrefix']}photoblog SET photoid = " . (int)$photoid . " WHERE entryid = " . (int)$entryid;
        serendipity_db_query($q);
    }
    
    function getPhoto($entryid) {
        global $serendipity;
        $q = "SELECT * FROM {$serendipity['dbPrefix']}photoblog WHERE entryid=" . (int)$entryid;
        $row = serendipity_db_query($q, true);
        
        if (!isset($row) || !is_array($row)) {
            $row = null;
        }
        
        return $row;
    }
    
    function deletePhoto($entryid) {
        global $serendipity;
        $q = "DELETE FROM {$serendipity['dbPrefix']}photoblog WHERE entryid = " . (int)$entryid;
        serendipity_db_query($q);
    }
    
    function parsePhotoname($name) {
        global $serendipity;
        
        $bits = explode("/", $name);
        $filename = array_pop($bits);
        $filebits = explode(".", $filename);
        $ext = array_pop($filebits);
        $f = implode(".", $filebits);
        $fullpath = implode("/", $bits);
        $uploads = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'];
        $path = substr($fullpath, strlen($uploads)) . "/";
        $q = "SELECT * FROM {$serendipity['dbPrefix']}images WHERE name='" . $f . "' and extension='" . $ext . "' and path='" . $path . "'" ;
        $file = serendipity_db_query($q, true);
        
        if (!isset($file) || !is_array($file)) {
            $file = null;
        }
        
        return $file;
    }
    
    function pb_backend_display() {
        global $serendipity;
        
        if ($this->get_config('version') != PLUGIN_EVENT_PHOTOBLOG_VERSION) {
            $this->checkScheme();
        }
        
        $photoname = '';
        if (isset($serendipity['POST']['properties']['photoname'])) {
            $photoname = $serendipity['POST']['properties']['photoname'];
        } elseif (isset($serendipity['GET']['id'])) {
            $row = $this->getPhoto($serendipity['GET']['id']);
            if (isset($row)) {
                $file = serendipity_fetchImageFromDatabase($row['photoid']);
                $photoname = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] .'.'. $file['extension'];
            }
        }

?>
        <fieldset style="margin: 5px">
            <legend><?php echo PLUGIN_EVENT_PHOTOBLOG_TITLE; ?></legend>
            <?php echo PLUGIN_EVENT_PHOTOBLOG_SELECTPHOTO; ?>
            <input id="photoname" type="text" name="serendipity[properties][photoname]" readonly="true" size="30" value="<?php echo $photoname; ?>" />
            <input type="button" name="addPhoto" value="Photo" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[filename_only]=true&serendipity[htmltarget]=photoname', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
            <input type="button" name="delPhoto" value="Clear" style="" onclick="document.getElementById('photoname').value = '';" />
        </fieldset>
<?php
    }
    
    function pb_backend_save($eventData) {
        global $serendipity;

        if (!isset($serendipity['POST']['properties']) || !is_array($serendipity['POST']['properties']) || !isset($eventData['id'])) {
            return true;
        }
        
        $prop_val = $serendipity['POST']['properties']['photoname'];
        
        
        $row = $this->getPhoto($eventData['id']);

        if (isset($row)) {
            if (!empty($prop_val)) {
                $file = $this->parsePhotoname($prop_val);
                $this->updatePhoto($eventData['id'], $file['id']);
            } else {
                $this->clearPhoto($eventData['id']);
            }
        } elseif(!empty($prop_val)) {
            $file = $this->parsePhotoname($prop_val);
            $this->addPhoto($eventData['id'], $file['id']);
        }
    }
    
    function pb_entry_display(&$eventData) {
        global $serendipity;
        
        $elements = count($eventData);
        for ($i = 0; $i < $elements; $i++) {
            $row = $this->getPhoto($eventData[$i]['id']);
            if (isset($row)) {
                $file = serendipity_fetchImageFromDatabase($row['photoid']);
                
                $imgsrc= $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] .'.'. $file['extension'];
                $img = "<div align=center><img src=\"" . $imgsrc . "\" width=" . $file['dimensions_width'] . " height=" . $file['dimensions_height'] . " /></div>";
                $eventData[$i]['body'] = $img . $eventData[$i]['body'];
            }
        }
    }

    function event_hook($event, &$bag, &$eventData) {
        global $serendipity;
    
        $hooks = &$bag->get('event_hooks');
        
        if (isset($hooks[$event])) {
            switch($event) {
                case 'backend_display':
                    $this->pb_backend_display();
                    return true;
#                case 'backend_publish':
                case 'frontend_display':
                    $this->pb_backend_save($eventData);
                    return true;
                case 'entry_display':
                    $this->pb_entry_display($eventData);
                    return true;
                default:
                    return false;
            }
        } else {
            return false;
        }
    }
}

/* vim: set sts=4 ts=4 expandtab : */
?>

[Php-blog-plugin-cvs] additional_plugins/serendipity_plugin_photoblog - New directory

[Riken <ri...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_plugin_photoblog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12386/serendipity_plugin_photoblog

Log Message:
Directory /cvsroot/php-blog/additional_plugins/serendipity_plugin_photoblog added to the repository

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_thumbnails - New directory

[Riken <ri...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_thumbnails
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12264/serendipity_event_thumbnails

Log Message:
Directory /cvsroot/php-blog/additional_plugins/serendipity_event_thumbnails added to the repository

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_deletelink - New directory

[Riken <ri...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_deletelink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12163/serendipity_event_deletelink

Log Message:
Directory /cvsroot/php-blog/additional_plugins/serendipity_event_deletelink added to the repository

[Php-blog-plugin-cvs] additional_plugins/serendipity_event_photoblog - New directory

[Riken <ri...@us...>]

Update of /cvsroot/php-blog/additional_plugins/serendipity_event_photoblog
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11396/serendipity_event_photoblog

Log Message:
Directory /cvsroot/php-blog/additional_plugins/serendipity_event_photoblog added to the repository