Skip to content

Commit

Permalink
Pushing 2.1.0 version
Browse files Browse the repository at this point in the history
  • Loading branch information
chdemko committed Mar 4, 2013
1 parent b5cfcd3 commit cd282a4
Show file tree
Hide file tree
Showing 50 changed files with 1,690 additions and 195 deletions.
8 changes: 4 additions & 4 deletions README.markdown
Expand Up @@ -6,18 +6,18 @@ The *External Login* project is the continuation of the [Authentication Manager
Downloads
---------

* [External Login Package](http://download.chdemko.com/joomla/extensions/external-login/pkg_externallogin-2.0.5.zip) ([documentation](http://download.chdemko.com/joomla/extensions/external-login/External_Login_package-2.0.5-User_Guide-en-GB.pdf))
* [Admin template](http://download.chdemko.com/joomla/extensions/external-login/tpl_externallogin-2.0.5.zip)
* [External Login Package](http://download.chdemko.com/joomla/extensions/external-login/pkg_externallogin-2.1.0.zip) ([documentation](http://download.chdemko.com/joomla/extensions/external-login/External_Login_package-2.1.0-User_Guide-en-GB.pdf))
* [Admin template](http://download.chdemko.com/joomla/extensions/external-login/tpl_externallogin-2.1.0.zip)

External Login Plugins
----------------------

* [CAS Login Plugin](http://download.chdemko.com/joomla/extensions/external-login/plg_system_caslogin-2.0.5.zip) ([documentation](http://download.chdemko.com/joomla/extensions/external-login/CAS_Plugin-2.0.5-User_Guide-en-GB.pdf))
* [CAS Login Plugin](http://download.chdemko.com/joomla/extensions/external-login/plg_system_caslogin-2.1.0.zip) ([documentation](http://download.chdemko.com/joomla/extensions/external-login/CAS_Plugin-2.1.0-User_Guide-en-GB.pdf))

Community Builder
-----------------

* [Community Builder External Login Plugin](http://download.chdemko.com/joomla/extensions/external-login/plg_user_cbexternallogin-2.0.5.zip)
* [Community Builder External Login Plugin](http://download.chdemko.com/joomla/extensions/external-login/plg_user_cbexternallogin-2.1.0.zip)

Requirements
------------
Expand Down
2 changes: 1 addition & 1 deletion build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="external-login" default="build" basedir=".">
<property name="server" value="http://download.chdemko.com/joomla/extensions/external-login" />
<property name="version" value="2.0.5" />
<property name="version" value="2.1.0" />
<property name="dist" value="build" />

<target name="build" depends="clean, src, docs, readme, server "/>
Expand Down
76 changes: 76 additions & 0 deletions src/pkg_externallogin/com_externallogin/admin/controllers/logs.php
@@ -0,0 +1,76 @@
<?php

/**
* @package External Login
* @subpackage Component
* @copyright Copyright (C) 2008-2013 Christophe Demko, Ioannis Barounis, Alexandre Gandois. All rights reserved.
* @author Christophe Demko
* @author Ioannis Barounis
* @author Alexandre Gandois
* @link http://www.chdemko.com
* @license http://www.gnu.org/licenses/gpl-2.0.html
*/

// No direct access to this file
defined('_JEXEC') or die;

// import Joomla controlleradmin library
jimport('joomla.application.component.controlleradmin');

/**
* Logs Controller of External Login component
*
* @package External Login
* @subpackage Component
*
* @since 2.1.0
*/
class ExternalloginControllerLogs extends JControllerAdmin
{
/**
* The prefix to use with controller messages.
*
* @var string
* @since 2.1.0
*/
protected $text_prefix = 'COM_EXTERNALLOGIN_LOGS';

/**
* Proxy for getModel.
*
* @see JController::getModel
*
* @since 2.1.0
*/
public function getModel($name = 'Log', $prefix = 'ExternalloginModel', $config = null)
{
return parent::getModel($name, $prefix, isset($config) ? $config : array('ignore_request' => true));
}

/**
* Delete logs
*
* @since 2.1.0
*/
public function delete()
{
// Check for request forgeries.
JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN'));

// Get/Create the model
$model = $this->getModel('Logs', 'ExternalloginModel', array());

// Remove the items.
$count = $model->getTotal();
if ($model->delete())
{
$this->setMessage(JText::plural('COM_EXTERNALLOGIN_LOGS_N_ITEMS_DELETED', $count));
}
else
{
$this->setMessage($model->getError());
}

$this->setRedirect(JRoute::_('index.php?option=com_externallogin&view=logs', false));
}
}
Expand Up @@ -178,15 +178,15 @@ public function enableExternallogin()

// Make sure the item ids are integers
JArrayHelper::toInteger($cid);
var_dump($cid,$sid);die;

// Publish the items.
if (!$model->enableExternallogin($cid, $sid))
{
JError::raiseWarning(500, $model->getError());
}
else
{
$this->setMessage(JText::plural('COM_EXTERNALLOGIN_USERS_N_USERS_EXTERNALLOGIN_DISABLED', count($cid)));
$this->setMessage(JText::plural('COM_EXTERNALLOGIN_USERS_N_USERS_EXTERNALLOGIN_ENABLED', count($cid)));
}
}
$this->setRedirect(JRoute::_('index.php?option=com_externallogin&view=users', false));
Expand Down
Expand Up @@ -37,7 +37,8 @@ public static function addSubmenu($submenu = 'servers')
{
// Addsubmenu
JSubMenuHelper::addEntry(JText::_('COM_EXTERNALLOGIN_SUBMENU_SERVERS'), JRoute::_('index.php?option=com_externallogin', false), $submenu == 'servers');
//JSubMenuHelper::addEntry(JText::_('COM_EXTERNALLOGIN_SUBMENU_USERS'), JRoute::_('index.php?option=com_externallogin&view=users', false), $submenu == 'users');
JSubMenuHelper::addEntry(JText::_('COM_EXTERNALLOGIN_SUBMENU_USERS'), JRoute::_('index.php?option=com_externallogin&view=users', false), $submenu == 'users');
JSubMenuHelper::addEntry(JText::_('COM_EXTERNALLOGIN_SUBMENU_LOGS'), JRoute::_('index.php?option=com_externallogin&view=logs', false), $submenu == 'logs');
JSubMenuHelper::addEntry(JText::_('COM_EXTERNALLOGIN_SUBMENU_ABOUT'), JRoute::_('index.php?option=com_externallogin&view=about', false), $submenu == 'about');

// set some global property
Expand All @@ -58,6 +59,63 @@ public static function getPlugins()
return (array) $app->triggerEvent('onGetOption', array('com_externallogin'));
}

/**
* Get a list of servers
*
* @return array array of servers
*
* @since 2.1.0
*/
public static function getServers($config = array())
{
$options = array();
$model = JModel::getInstance('Servers', 'ExternalloginModel', $config);
$model->setState('list.ordering', 'a.ordering');
$model->setState('list.direction', 'ASC');
$items = $model->getItems();
foreach($items as $item)
{
$options[] = array('value' => $item->id, 'text' => $item->title);
}
return $options;
}

/**
* Get a list of priorities
*
* @return array array of priorities
*
* @since 2.1.0
*/
public static function getPriorities()
{
$options = array();
for ($i = 1; $i <= 128; $i = $i * 2)
{
$options[] = array('value' => $i, 'text' => 'COM_EXTERNALLOGIN_GRID_LOG_PRIORITY_' . $i);
}
return $options;
}

/**
* Get a list of categories
*
* @return array array of categories
*
* @since 2.1.0
*/
public static function getCategories()
{
$dbo = JFactory::getDbo();
$categories = $dbo->setQuery($dbo->getQuery(true)->select('category')->from('#__externallogin_logs')->group('category'))->loadColumn();
$options = array();
foreach ($categories as $category)
{
$options[] = array('value' => $category, 'text' => $category);
}
return $options;
}

/**
* Get a list of groups from a string
*
Expand All @@ -69,7 +127,7 @@ public static function getPlugins()
public static function getGroups($path, $separator = '/')
{
// Get the dbo
$db = JFactory::getDbo();
$dbo = JFactory::getDbo();

// Split the path
if (empty($separator))
Expand All @@ -86,10 +144,10 @@ public static function getGroups($path, $separator = '/')
if ($count && !empty($path[$count - 1]))
{
// prepare query
$query = $db->getQuery(true);
$query = $dbo->getQuery(true);
$query->select('a' . ($count - 1) . '.id as id');
$query->from('#__usergroups AS a' . ($count - 1));
$query->where('a' . ($count - 1) . '.title = ' . $db->quote($path[$count - 1]));
$query->where('a' . ($count - 1) . '.title = ' . $dbo->quote($path[$count - 1]));
for ($i = $count - 2; $i >= 0; $i--)
{
if (empty($path[$i]))
Expand All @@ -108,12 +166,12 @@ public static function getGroups($path, $separator = '/')
else
{
$query->leftJoin('#__usergroups AS a' . $i . ' ON a' . $i . '.id = a' . ($i + 1) . '.parent_id');
$query->where('a' . $i . '.title LIKE ' . $db->quote($path[$i]));
$query->where('a' . $i . '.title LIKE ' . $dbo->quote($path[$i]));

}
}
$db->setQuery($query);
return $db->loadColumn();
$dbo->setQuery($query);
return $dbo->loadColumn();
}
// Path is incorrect
else
Expand Down
Expand Up @@ -15,21 +15,43 @@ COM_EXTERNALLOGIN_BUTTON_CANCEL="Cancel"
COM_EXTERNALLOGIN_BUTTON_UPLOAD="Upload"
COM_EXTERNALLOGIN_ERROR_BAD_FILE="Bad file format"
COM_EXTERNALLOGIN_ERROR_CANNOT_DOWNLOAD="Cannot download"
COM_EXTERNALLOGIN_FIELD_SERVER_ALLOW_CHANGE_PASSWORD_DESC="Allow external users to change their Joomla! password. <b>This will allow them to connect to the site without log in using external server</b>."
COM_EXTERNALLOGIN_FIELD_SERVER_ALLOW_CHANGE_PASSWORD_LABEL="Change password"
COM_EXTERNALLOGIN_FIELD_SERVER_AUTOREGISTER_DESC="This automatically registers a new user when he is logged in on the external server."
COM_EXTERNALLOGIN_FIELD_SERVER_AUTOREGISTER_LABEL="Auto-register"
COM_EXTERNALLOGIN_FIELD_SERVER_AUTOUPDATE_DESC="This automatically updates each user when he logs in."
COM_EXTERNALLOGIN_FIELD_SERVER_AUTOUPDATE_LABEL="Auto-update"
COM_EXTERNALLOGIN_FIELD_SERVER_LOG_AUTOREGISTER_DESC="Log auto-register operation"
COM_EXTERNALLOGIN_FIELD_SERVER_LOG_AUTOREGISTER_LABEL="Auto-registering"
COM_EXTERNALLOGIN_FIELD_SERVER_LOG_AUTOUPDATE_DESC="Log auto-update operation"
COM_EXTERNALLOGIN_FIELD_SERVER_LOG_AUTOUPDATE_LABEL="Auto-updating"
COM_EXTERNALLOGIN_FIELD_SERVER_LOG_USER_CHANGE_PASSWORD_DESC="Log users when they try to change their password while it is forbidden"
COM_EXTERNALLOGIN_FIELD_SERVER_LOG_USER_CHANGE_PASSWORD_LABEL="Changing password "
COM_EXTERNALLOGIN_FIELD_SERVER_LOG_USER_DELETE_DESC="Log user deletion"
COM_EXTERNALLOGIN_FIELD_SERVER_LOG_USER_DELETE_LABEL="User deletion"
COM_EXTERNALLOGIN_FIELD_SERVER_SPACER_LABEL="<p class='tip'>General</p>"
COM_EXTERNALLOGIN_FIELD_SERVER_TITLE_DESC="Unique server title"
COM_EXTERNALLOGIN_FIELD_SERVER_TITLE_LABEL="Title"
COM_EXTERNALLOGIN_FIELD_SERVER_USERGROUP_DESC="Default user group for a new user."
COM_EXTERNALLOGIN_FIELD_SERVER_USERGROUP_LABEL="Default user group"
COM_EXTERNALLOGIN_FIELDSET_SERVER_DETAILS_DESC=""
COM_EXTERNALLOGIN_FIELDSET_SERVER_DETAILS_LABEL="Server details"
COM_EXTERNALLOGIN_FIELDSET_UPLOAD_DETAILS_DESC=""
COM_EXTERNALLOGIN_FIELDSET_SERVER_LOGGING_LABEL="Logging"
COM_EXTERNALLOGIN_FIELDSET_UPLOAD_DETAILS_DESC="You must use a <em>.csv</em> file whose rows contain username, name, email and the list of groups. The format used is similar to that of the download process."
COM_EXTERNALLOGIN_FIELDSET_UPLOAD_DETAILS_LABEL="Upload users for <em>%s</em> server"
COM_EXTERNALLOGIN_FIELD_UPLOAD_FILE_DESC="List of users"
COM_EXTERNALLOGIN_FIELD_UPLOAD_FILE_LABEL="File"
COM_EXTERNALLOGIN_FILTER_SEARCH_DESC="Search::Search title. Prefix with ID: to search for a server ID"
COM_EXTERNALLOGIN_FILTER_LOGS_SEARCH_DESC="Search::Search message."
COM_EXTERNALLOGIN_FILTER_SERVERS_SEARCH_DESC="Search::Search title. Prefix with ID: to search for a server ID"
COM_EXTERNALLOGIN_FILTER_USERS_SEARCH_DESC="Search::Search user. Prefix with ID: to search for a user ID"
COM_EXTERNALLOGIN_GRID_LOG_PRIORITY_128="Debug"
COM_EXTERNALLOGIN_GRID_LOG_PRIORITY_16="Warning"
COM_EXTERNALLOGIN_GRID_LOG_PRIORITY_1="Emergency"
COM_EXTERNALLOGIN_GRID_LOG_PRIORITY_2="Alert"
COM_EXTERNALLOGIN_GRID_LOG_PRIORITY_32="Notice"
COM_EXTERNALLOGIN_GRID_LOG_PRIORITY_4="Critical"
COM_EXTERNALLOGIN_GRID_LOG_PRIORITY_64="Info"
COM_EXTERNALLOGIN_GRID_LOG_PRIORITY_8="Error"
COM_EXTERNALLOGIN_GRID_SERVER_ARCHIVED="Archived"
COM_EXTERNALLOGIN_GRID_SERVER_DISABLED="Plugin disabled"
COM_EXTERNALLOGIN_GRID_SERVER_PUBLISHED="Published"
Expand All @@ -47,22 +69,36 @@ COM_EXTERNALLOGIN_GRID_USER_JOOMLA_DISABLE="Disable"
COM_EXTERNALLOGIN_GRID_USER_JOOMLA_ENABLED="Enabled"
COM_EXTERNALLOGIN_GRID_USER_JOOMLA_ENABLE="Enable"
COM_EXTERNALLOGIN_GRID_USER_JOOMLA="Joomla! user"
COM_EXTERNALLOGIN_HEADING_CATEGORY="Category"
COM_EXTERNALLOGIN_HEADING_DATE="Date (UTC)"
COM_EXTERNALLOGIN_HEADING_EMAIL="Email"
COM_EXTERNALLOGIN_HEADING_EXTERNAL="External"
COM_EXTERNALLOGIN_HEADING_JOOMLA="Joomla!"
COM_EXTERNALLOGIN_HEADING_MESSAGE="Message"
COM_EXTERNALLOGIN_HEADING_NAME="Name"
COM_EXTERNALLOGIN_HEADING_PLUGIN="Plugin"
COM_EXTERNALLOGIN_HEADING_PRIORITY="Priority"
COM_EXTERNALLOGIN_HEADING_SERVER="Server"
COM_EXTERNALLOGIN_HEADING_USERNAME="Username"
COM_EXTERNALLOGIN_HELP_MANAGER_LOGS="External_Login_Logs"
COM_EXTERNALLOGIN_HELP_MANAGER_SERVERS="External_Login_Servers"
COM_EXTERNALLOGIN_LABEL_BEGIN="Start date"
COM_EXTERNALLOGIN_LABEL_END="End date"
COM_EXTERNALLOGIN_LOGIN_HELP="External_Login_Login_Help"
COM_EXTERNALLOGIN_LOGS_N_ITEMS_DELETED_0="0 log deleted"
COM_EXTERNALLOGIN_LOGS_N_ITEMS_DELETED_1="1 log deleted"
COM_EXTERNALLOGIN_LOGS_N_ITEMS_DELETED_MORE="%d logs deleted"
COM_EXTERNALLOGIN_MANAGER_ABOUT="About"
COM_EXTERNALLOGIN_MANAGER_LOGS="Logs"
COM_EXTERNALLOGIN_MANAGER_SERVER_EDIT="Servers Manager: Edit"
COM_EXTERNALLOGIN_MANAGER_SERVER_NEW="Servers Manager: New"
COM_EXTERNALLOGIN_MANAGER_SERVERS="Servers manager"
COM_EXTERNALLOGIN_MANAGER_SERVER_VIEW="Servers Manager: View"
COM_EXTERNALLOGIN_MANAGER_USERS="Users manager"
COM_EXTERNALLOGIN_MSG_LOGS_DELETE="Are you sure to delete all these logs?"
COM_EXTERNALLOGIN_MSG_SERVERS_DELETE="Are you sure to delete all these servers and the associated users?"
COM_EXTERNALLOGIN_MSG_UPLOAD_SUCCESS="Upload successfully completed"
COM_EXTERNALLOGIN_MSG_LOGS_FILTER_RESET="Filters have been reset"
COM_EXTERNALLOGIN_N_ITEMS_ARCHIVED_1="1 server archived"
COM_EXTERNALLOGIN_N_ITEMS_ARCHIVED_MORE="%d servers archived"
COM_EXTERNALLOGIN_N_ITEMS_CHECKED_IN_1="1 server checked in"
Expand All @@ -75,8 +111,14 @@ COM_EXTERNALLOGIN_N_ITEMS_TRASHED_1="1 server trashed"
COM_EXTERNALLOGIN_N_ITEMS_TRASHED_MORE="%d servers trashed"
COM_EXTERNALLOGIN_N_ITEMS_UNPUBLISHED_1="1 server unpublished"
COM_EXTERNALLOGIN_N_ITEMS_UNPUBLISHED_MORE="%d servers unpublished"
COM_EXTERNALLOGIN_OPTION_SELECT_CATEGORY="- Select category -"
COM_EXTERNALLOGIN_OPTION_SELECT_EXTERNAL="- External status -"
COM_EXTERNALLOGIN_OPTION_SELECT_JOOMLA="- Joomla! status -"
COM_EXTERNALLOGIN_OPTION_SELECT_PLUGIN="- Select Plugin -"
COM_EXTERNALLOGIN_OPTION_SELECT_PRIORITY="- Select priority -"
COM_EXTERNALLOGIN_OPTION_SELECT_SERVER="- Select server -"
COM_EXTERNALLOGIN_PAGETITLE_ABOUT="External Login - About"
COM_EXTERNALLOGIN_PAGETITLE_LOGS="External Login - Logs"
COM_EXTERNALLOGIN_PAGETITLE_SERVER="External Login - Server"
COM_EXTERNALLOGIN_PAGETITLE_SERVERS="External Login - Servers"
COM_EXTERNALLOGIN_PAGETITLE="%s - %s"
Expand All @@ -87,24 +129,29 @@ COM_EXTERNALLOGIN_SITE_FIELD_REDIRECT_LABEL="Redirect"
COM_EXTERNALLOGIN_SITE_FIELD_SERVERS_DESC="Choose the server"
COM_EXTERNALLOGIN_SITE_FIELD_SERVERS_LABEL="Server"
COM_EXTERNALLOGIN_SUBMENU_ABOUT="About"
COM_EXTERNALLOGIN_SUBMENU_LOGS="Logs"
COM_EXTERNALLOGIN_SUBMENU_SERVERS="Servers"
COM_EXTERNALLOGIN_SUBMENU_USERS="Users"
COM_EXTERNALLOGIN_SUBMENU_USERS="Users"
COM_EXTERNALLOGIN_TOOLBAR_DISABLE_EXTERNALLOGIN="Disable"
COM_EXTERNALLOGIN_TOOLBAR_DISABLE_JOOMLA="Disable"
COM_EXTERNALLOGIN_TOOLBAR_DISABLE_JOOMLA_MSG="Are you sure to disable these users to login using classical Joomla! method?"
COM_EXTERNALLOGIN_TOOLBAR_DOWNLOAD="Download"
COM_EXTERNALLOGIN_TOOLBAR_DISABLE_JOOMLA_MSG="Are you sure to disable these users to login using classical Joomla! method?. It will erase their Joomla! password."
COM_EXTERNALLOGIN_TOOLBAR_ENABLE_EXTERNALLOGIN="Enable"
COM_EXTERNALLOGIN_TOOLBAR_ENABLE_JOOMLA="Enable"
COM_EXTERNALLOGIN_TOOLBAR_ENABLE_JOOMLA_MSG="Are you sure to enable these users to login using classical Joomla! method?"
COM_EXTERNALLOGIN_TOOLBAR_UPLOAD="Upload"
COM_EXTERNALLOGIN_TOOLBAR_ENABLE_JOOMLA_MSG="Are you sure to enable these users to login using classical Joomla! method?. It will create an arbitrary password for them."
COM_EXTERNALLOGIN_TOOLBAR_LOGS_DOWNLOAD="Download"
COM_EXTERNALLOGIN_TOOLBAR_SERVER_DOWNLOAD="Download"
COM_EXTERNALLOGIN_TOOLBAR_SERVER_UPLOAD="Upload"
COM_EXTERNALLOGIN_USERS_N_USERS_EXTERNALLOGIN_DISABLED_0="0 user disabled to login using external login method"
COM_EXTERNALLOGIN_USERS_N_USERS_EXTERNALLOGIN_DISABLED_1="1 user disabled to login using external login method"
COM_EXTERNALLOGIN_USERS_N_USERS_EXTERNALLOGIN_DISABLED_MORE="%d user disabled to login using external login method"
COM_EXTERNALLOGIN_USERS_N_USERS_EXTERNALLOGIN_ENABLED_0="0 user enabled to login using external login method"
COM_EXTERNALLOGIN_USERS_N_USERS_EXTERNALLOGIN_ENABLED_1="1 user enabled to login using external login method"
COM_EXTERNALLOGIN_USERS_N_USERS_EXTERNALLOGIN_ENABLED_MORE="%d user enabled to login using external login method"
COM_EXTERNALLOGIN_USERS_N_USERS_JOOMLA_DISABLED_0="0 user disabled to login using classical Joomla! method"
COM_EXTERNALLOGIN_USERS_N_USERS_JOOMLA_DISABLED_1="1 user disabled to login using classical Joomla! method"
COM_EXTERNALLOGIN_USERS_N_USERS_JOOMLA_DISABLED_MORE="%d users disabled to login using classical Joomla! method"
COM_EXTERNALLOGIN_USERS_N_USERS_JOOMLA_ENABLED_0="0 user enabled to login using classical Joomla! method"
COM_EXTERNALLOGIN_USERS_N_USERS_JOOMLA_ENABLED_1="1 user enabled to login using classical Joomla! method"
COM_EXTERNALLOGIN_USERS_N_USERS_JOOMLA_ENABLED_MORE="%d users enabled to login using classical Joomla! method"
JOPTION_ACCESS_SHOW_ALL_GROUPS="- Select Usergroup -"

Expand Up @@ -15,6 +15,7 @@ COM_EXTERNALLOGIN_LOGIN_VIEW_DEFAULT_OPTION="Login"
COM_EXTERNALLOGIN_LOGIN_VIEW_DEFAULT_TITLE="General Login"
COM_EXTERNALLOGIN_MENU_ABOUT="About"
COM_EXTERNALLOGIN_MENU="External login"
COM_EXTERNALLOGIN_MENU_LOGS="Logs"
COM_EXTERNALLOGIN_MENU_USERS="Users"
COM_EXTERNALLOGIN_SERVER_VIEW_DEFAULT_DESC="Server login description"
COM_EXTERNALLOGIN_SERVER_VIEW_DEFAULT_OPTION="Server login"
Expand Down

0 comments on commit cd282a4

Please sign in to comment.