[Linpha-cvs] SF.net SVN: linpha: [4564] trunk/linpha2

[<fan...@us...>]

Revision: 4564
          http://svn.sourceforge.net/linpha/?rev=4564&view=rev
Author:   fangehrn
Date:     2006-08-30 14:42:46 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
 * improved admin config

Modified Paths:
--------------
    trunk/linpha2/ChangeLog
    trunk/linpha2/admin/index.php
    trunk/linpha2/admin/settings_features.php
    trunk/linpha2/admin/settings_layout.php
    trunk/linpha2/lib/classes/linpha.admin.class.php
    trunk/linpha2/lib/classes/linpha.sql.class.php
    trunk/linpha2/lib/modules/module.settings.php
    trunk/linpha2/templates/default/global.html.php

Modified: trunk/linpha2/ChangeLog
===================================================================
--- trunk/linpha2/ChangeLog	2006-08-30 19:16:00 UTC (rev 4563)
+++ trunk/linpha2/ChangeLog	2006-08-30 21:42:46 UTC (rev 4564)
@@ -1,5 +1,5 @@
 2006-08-30 flo
- * working on admin config, may be broken now untill finished
+ * improved admin config
 
 2006-08-28 flo
  * fixed php notice

Modified: trunk/linpha2/admin/index.php
===================================================================
--- trunk/linpha2/admin/index.php	2006-08-30 19:16:00 UTC (rev 4563)
+++ trunk/linpha2/admin/index.php	2006-08-30 21:42:46 UTC (rev 4564)
@@ -12,8 +12,10 @@
 
 	if(!$linpha->sql->isAdmin())
 	{
-		echo i18n("Only Admin Has Access To This Area");
-		exit(1);
+		linSysLog(i18n("Please Login!"));
+		$_GET['cat'] = 'alb';
+		include_once(LINPHA_DIR.'/lib/modules/module.albums.php');
+		exit();
 	}
 
 	include_once(LINPHA_DIR.'/lib/classes/linpha.admin.class.php');

Modified: trunk/linpha2/admin/settings_features.php
===================================================================
--- trunk/linpha2/admin/settings_features.php	2006-08-30 19:16:00 UTC (rev 4563)
+++ trunk/linpha2/admin/settings_features.php	2006-08-30 21:42:46 UTC (rev 4564)
@@ -31,10 +31,9 @@
 			));
 		}
 
-
-	$LinAdmin->printAdminConfig('radio',i18n("Use EXIF"),'sys_image_exif',$option_value_system['sys_image_exif']);
-	$LinAdmin->printAdminConfig('radio',i18n("Use IPTC"),'sys_image_iptc',$option_value_system['sys_image_iptc']);
-	$LinAdmin->printAdminConfig('radio',i18n("Use XMP"),'sys_image_xmp',$option_value_system['sys_image_xmp']);
+	$LinAdmin->printAdminConfig('radio',$LinAdmin->getDescriptionByOptionName('sys_image_exif'),'sys_image_exif',$option_value_system['sys_image_exif']);
+	$LinAdmin->printAdminConfig('radio',$LinAdmin->getDescriptionByOptionName('sys_image_iptc'),'sys_image_iptc',$option_value_system['sys_image_iptc']);
+	$LinAdmin->printAdminConfig('radio',$LinAdmin->getDescriptionByOptionName('sys_image_xmp'),'sys_image_xmp',$option_value_system['sys_image_xmp']);
 	break;
 }
 ?>
\ No newline at end of file

Modified: trunk/linpha2/admin/settings_layout.php
===================================================================
--- trunk/linpha2/admin/settings_layout.php	2006-08-30 19:16:00 UTC (rev 4563)
+++ trunk/linpha2/admin/settings_layout.php	2006-08-30 21:42:46 UTC (rev 4564)
@@ -9,6 +9,7 @@
 $array_menu = Array(
 	'home' => Array('name' => 'Home Site', 'link' => 'settings_layout_home'),
 	'thumb' => Array('name' => 'Thumb View', 'link' => 'settings_layout_thumb'),
+	'image' => Array('name' => 'Image View', 'link' => 'settings_layout_image'),
 	'others' => Array('name' => 'Others', 'link' => 'settings_layout_others')
 );
 
@@ -34,11 +35,13 @@
 	 */
 		if(isset($_POST['cmd']) && $_POST['cmd']=='saveconfig')
 		{
-			$LinAdmin->saveConfig(Array('sys_style_home_usedefaultwelcometext',
+			$LinAdmin->saveConfig(Array(
+				'sys_style_home_usedefaultwelcometext',
 				'sys_style_home_nrrandomimages',
 				'sys_style_home_showalbums',
 				'sys_style_home_firstsortorder',
-				'sys_style_home_showbrowsebydate'));
+				'sys_style_home_showbrowsebydate'
+			));
 			if(isset($_POST['welcometext']) && $_POST['welcometext'] != $welcometxt)
 			{
 				/**
@@ -62,26 +65,48 @@
 
 
 	echo '<b>'.i18n("Welcome Text").'</b><br />';
-	LinAdmin::printAdminConfig('radio',i18n("Use Default Welcome Text"),'sys_style_home_usedefaultwelcometext',$option_value_system['sys_style_home_usedefaultwelcometext']);
+	$LinAdmin->printAdminConfig('radio',i18n("Use Default Welcome Text"),'sys_style_home_usedefaultwelcometext',$LinAdmin->option_value_system['sys_style_home_usedefaultwelcometext']);
 
 	?>
 	<textarea name="welcometext" rows="10" cols="50"><?php echo htmlspecialchars($welcometxt,ENT_QUOTES); ?></textarea>
 	<br /><br /><br />
 	<?php
-	$LinAdmin->printAdminConfig('text',i18n("Nr Of Random Images (0 to disable)"),'sys_style_home_nrrandomimages',$option_value_system['sys_style_home_nrrandomimages']);
-	$LinAdmin->printAdminConfig('radio',i18n("Show Browse By Date"),'sys_style_home_showbrowsebydate',$option_value_system['sys_style_home_showbrowsebydate']);
-	$LinAdmin->printAdminConfig('radio',i18n("Show Albums On Home Site"),'sys_style_home_showalbums',$option_value_system['sys_style_home_showalbums']);
-	$LinAdmin->printAdminConfig('select',i18n("Sort Order Of First Level Albums"),'sys_style_home_firstsortorder',$option_value_system['sys_style_home_firstsortorder'],getSortOrders());
+	$LinAdmin->printAdminConfig('text',$LinAdmin->getDescriptionByOptionName('sys_style_home_nrrandomimages'),'sys_style_home_nrrandomimages',$LinAdmin->option_value_system['sys_style_home_nrrandomimages']);
+	$LinAdmin->printAdminConfig('radio',$LinAdmin->getDescriptionByOptionName('sys_style_home_showbrowsebydate'),'sys_style_home_showbrowsebydate',$LinAdmin->option_value_system['sys_style_home_showbrowsebydate']);
+	$LinAdmin->printAdminConfig('radio',$LinAdmin->getDescriptionByOptionName('sys_style_home_showalbums'),'sys_style_home_showalbums',$LinAdmin->option_value_system['sys_style_home_showalbums']);
+	$LinAdmin->printAdminConfig('select',$LinAdmin->getDescriptionByOptionName('sys_style_home_firstsortorder'),'sys_style_home_firstsortorder',$LinAdmin->option_value_system['sys_style_home_firstsortorder'],getSortOrders());
 	
 	break;
 case 'thumb':
-	$LinAdmin->printAdminConfig('radio',i18n("Show Subfolders Separate"),'sys_style_thumb_showsubfoldersseparate',$option_value_system['sys_style_thumb_showsubfoldersseparate']);
+
+	if(isset($_POST['cmd']) && $_POST['cmd']=='saveconfig')
+	{
+		$LinAdmin->saveConfig(Array(
+			'sys_style_thumb_showsubfoldersseparate'
+		));
+	}
+
+	$LinAdmin->printAdminConfig('radio',$LinAdmin->getDescriptionByOptionName('sys_style_thumb_showsubfoldersseparate'),'sys_style_thumb_showsubfoldersseparate',$LinAdmin->option_value_system['sys_style_thumb_showsubfoldersseparate']);
 	break;
 case 'image':
-	$LinAdmin->printAdminConfig('text',i18n("Nr Of Previous/Next Thumbnails"),'sys_style_image_nrprevnextthumbs',$option_value_system['sys_style_image_nrprevnextthumbs']);
+
+	if(isset($_POST['cmd']) && $_POST['cmd']=='saveconfig')
+	{
+		$LinAdmin->saveConfig(Array(
+			'sys_style_image_nrprevnextthumbs'
+		));
+	}
+
+	$LinAdmin->printAdminConfig('text',$LinAdmin->getDescriptionByOptionName('sys_style_image_nrprevnextthumbs'),'sys_style_image_nrprevnextthumbs',$LinAdmin->option_value_system['sys_style_image_nrprevnextthumbs']);
 	break;
 case 'others':
 
+	if(isset($_POST['cmd']) && $_POST['cmd']=='saveconfig')
+	{
+		/*$LinAdmin->saveConfig(Array(
+			''
+		));*/
+	}
 
 
 	break;

Modified: trunk/linpha2/lib/classes/linpha.admin.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.admin.class.php	2006-08-30 19:16:00 UTC (rev 4563)
+++ trunk/linpha2/lib/classes/linpha.admin.class.php	2006-08-30 21:42:46 UTC (rev 4564)
@@ -27,6 +27,7 @@
 
 public $options;
 public $options_value_system;
+public $description_array;
 
 /**
  * constructor
@@ -42,6 +43,26 @@
 		$this->options[] = $data['option_name'];
 		$this->option_value_system[$data['option_name']] = $data['option_value'];
 	}
+
+	$this->description_array = Array(
+		'sys_image_exif' => "Use EXIF",
+		'sys_image_iptc' => "Use IPTC",
+		'sys_image_xmp' => "Use XMP",
+		'sys_style_home_nrrandomimages' => "Nr Of Random Images (0 to disable)",
+		'sys_style_home_showbrowsebydate' => "Show Browse By Date",
+		'sys_style_home_showalbums' => "Show Albums On Home Site",
+		'sys_style_home_firstsortorder' => "Sort Order Of First Level Albums",
+		'sys_style_thumb_showsubfoldersseparate' => "Show Subfolders Separate",
+		'sys_style_image_nrprevnextthumbs' => "Nr Of Previous/Next Thumbnails",
+		'sys_lang' => "Language",
+		'sys_lang_autolang' => "Autodetection of language",
+		'sys_style_image_size' => "Image size",
+		'sys_style_sortorder' => "Sort order",
+		'sys_style_template' => "Template",
+		'sys_style_thumb_nojsnrcols' => "Nr Cols if Javascript deactivated",
+		'sys_style_thumb_nojsnrrows' => "Nr Rows if Javascript deactivated",
+		'sys_style_thumb_size_display' => "Thumb size"
+	);
 }
 
 function printAdminMenu($array_menu,$active)
@@ -268,10 +289,19 @@
 	'sys_style_home_showalbums',
 	'sys_style_home_usedefaultwelcometext',
 	'sys_style_thumb_showsubfoldersseparate',
-	'sys_user_autologin'
+	'sys_user_autologin',
+	'plugins_filemanager_enable'
 	);
 }
 
+function getDescriptionByOptionName( $option_name )
+{
+	if( isset( $this->description_array[ $option_name ] ) )
+	{
+		return i18n( $this->description_array[ $option_name ] );
+	}
+}
+
 } // end class LinAdmin
 
 ?>
\ No newline at end of file

Modified: trunk/linpha2/lib/classes/linpha.sql.class.php
===================================================================
--- trunk/linpha2/lib/classes/linpha.sql.class.php	2006-08-30 19:16:00 UTC (rev 4563)
+++ trunk/linpha2/lib/classes/linpha.sql.class.php	2006-08-30 21:42:46 UTC (rev 4564)
@@ -58,7 +58,7 @@
 		include_once(LINPHA_DIR.'/lib/adodb/adodb-errorhandler.inc.php');
 		
 		$sql_dir = '';
-		include_once(LINPHA_DIR.'/var/config.dir.php');
+		include(LINPHA_DIR.'/var/config.dir.php');	// no include_once if we reconnect from another directory...
 
 		$include_file = LinFilesys::getFullPath( $sql_dir ) . '/config.sql.php';
 		if( file_exists($include_file) )
@@ -96,7 +96,6 @@
 	switch(DB_TYPE)
 	{
 		case "sqlite":
-		{
 			if(isset($_SESSION['installmode1']))
 			{			
 				$sql_dir = LinFilesys::getFullPath($_SESSION['sql_dir']);
@@ -107,14 +106,10 @@
 				$GLOBALS['linpha']->db->Connect(LinFilesys::getFullPath( $sql_dir ).'/database.sqlite');		
 			}
 		break;
-		}
-		
 		case "mysql":
-		$GLOBALS['linpha']->db->Connect("$db_hostname:$db_port", $db_username, $db_password, $db_name);
+			$GLOBALS['linpha']->db->Connect("$db_hostname:$db_port", $db_username, $db_password, $db_name);
 		break;
-		
 		case "postgres":
-		{
 			if(isset($db_password))
 			{
 				$GLOBALS['linpha']->db->Connect("host=$db_hostname port=$db_port user=$db_username password=$db_password dbname=$db_name");
@@ -123,15 +118,10 @@
 			{
 				$GLOBALS['linpha']->db->Connect("host=$db_hostname port=$db_port user=$db_username dbname=$db_name");
 			}			
-		
 		break;
-		}
 		case "oci8po":
-		{
-				$GLOBALS['linpha']->db->PConnect($db_hostname, $db_username, $db_password, $db_name);
-	
+			$GLOBALS['linpha']->db->PConnect($db_hostname, $db_username, $db_password, $db_name);
 		break;
-		}
 	}
 	
 	if( !isset($GLOBALS['linpha']->db) OR !$GLOBALS['linpha']->db->isConnected() )

Modified: trunk/linpha2/lib/modules/module.settings.php
===================================================================
--- trunk/linpha2/lib/modules/module.settings.php	2006-08-30 19:16:00 UTC (rev 4563)
+++ trunk/linpha2/lib/modules/module.settings.php	2006-08-30 21:42:46 UTC (rev 4564)
@@ -26,20 +26,23 @@
 if(!defined('LINPHA_DIR')) { exit(1); }
 
 include_once(LINPHA_DIR.'/lib/classes/linpha.admin.class.php');
+$LinAdmin = new LinAdmin();
 
 /**
  * check permissions
  */
 	if( ! $GLOBALS['linpha']->sql->isLoggedIn())
 	{
-		echo i18n("No Access!");
+		linSysLog(i18n("Please Login!"));
+		$_GET['cat'] = 'alb';
+		include_once(LINPHA_DIR.'/lib/modules/module.albums.php');
 		exit();
 	}
 	
 /**
  * get user data
  */
-	$data = $GLOBALS['linpha']->db->GetRow("SELECT username, password, display_name, user_email ".
+	$user_data = $GLOBALS['linpha']->db->GetRow("SELECT username, password, display_name, user_email ".
 		"FROM ".PREFIX."users ".
 		"WHERE id = '".$_SESSION['user_id']."'");
 
@@ -82,7 +85,7 @@
 		 * check if username already exists
 		 * (only if it will be changed)
 		 */
-		if( $data['username'] != $_POST['username'] )
+		if( $user_data['username'] != $_POST['username'] )
 		{
 			$query = $GLOBALS['linpha']->db->Execute("SELECT username FROM ".PREFIX."users " .
 				"WHERE username = '".LinSql::linAddslashes($_POST['username'])."'");
@@ -112,9 +115,9 @@
 		/**
 		 * update data also for show in html form
 		 */
-		$data['username'] = $_POST['username'];
-		$data['user_email'] = $_POST['user_email'];
-		$data['display_name'] = $_POST['display_name'];
+		$user_data['username'] = $_POST['username'];
+		$user_data['user_email'] = $_POST['user_email'];
+		$user_data['display_name'] = $_POST['display_name'];
 		
 		/**
 		 * update session variables
@@ -130,7 +133,7 @@
 		/**
 		 * check if old password is correct
 		 */
-		if( md5($_POST['old_password']) != $data['password'] )
+		if( md5($_POST['old_password']) != $user_data['password'] )
 		{
 			throw new Exception(i18n("Old password is not correct."));
 		}
@@ -164,7 +167,7 @@
 		/**
 		 * save and reload config
 		 */
-		LinAdmin::saveConfig($options,$_SESSION['user_id']);
+		$LinAdmin->saveConfig($options,$_SESSION['user_id']);
 		linSysLog(i18n("Successfully updated data."));
 		break;
 	case 'loaddefault':
@@ -186,9 +189,9 @@
 <h2><?php echo i18n("Change User Information"); ?></h2>
 <form method="POST" action="./?cat=settings">
 <?php
-LinAdmin::printAdminConfig('text',i18n("Username"),'username',$data['username']);
-LinAdmin::printAdminConfig('text',i18n("Display Name"),'display_name',$data['display_name']);
-LinAdmin::printAdminConfig('text',i18n("Email"),'user_email',$data['user_email']);
+$LinAdmin->printAdminConfig('text',i18n("Username"),'username',$user_data['username']);
+$LinAdmin->printAdminConfig('text',i18n("Display Name"),'display_name',$user_data['display_name']);
+$LinAdmin->printAdminConfig('text',i18n("Email"),'user_email',$user_data['user_email']);
 ?>
 <input type="hidden" name="cmd" value="saveuserinfos" />
 <input type="submit" name="submit" value="<?php echo i18n("Submit"); ?>" class="button" />
@@ -198,9 +201,9 @@
 <h2><?php echo i18n("Change Password"); ?></h2>
 <form method="POST" name="change_password" action="./?cat=settings">
 <?php
-LinAdmin::printAdminConfig('password',i18n("Old Password"),'old_password','');
-LinAdmin::printAdminConfig('password',i18n("New Password"),'new_password','');
-LinAdmin::printAdminConfig('password',i18n("Repeat New Password"),'new_password2','');
+$LinAdmin->printAdminConfig('password',i18n("Old Password"),'old_password','');
+$LinAdmin->printAdminConfig('password',i18n("New Password"),'new_password','');
+$LinAdmin->printAdminConfig('password',i18n("Repeat New Password"),'new_password2','');
 ?>
 <input type="hidden" name="cmd" value="changepw" />
 <input type="submit" name="submit" value="<?php echo i18n("Submit"); ?>" class="button" onclick="return checkPassLength();" />
@@ -231,7 +234,7 @@
 	{
 		$type = 'text';
 	}
-	LinAdmin::printAdminConfig($type,$value,$value,$GLOBALS['linpha']->sql->config->value[$value]);
+	$LinAdmin->printAdminConfig($type,$LinAdmin->getDescriptionByOptionName($value),$value,$GLOBALS['linpha']->sql->config->value[$value]);
 }
 ?>
 <input type="hidden" name="cmd" value="saveconfig" />

Modified: trunk/linpha2/templates/default/global.html.php
===================================================================
--- trunk/linpha2/templates/default/global.html.php	2006-08-30 19:16:00 UTC (rev 4563)
+++ trunk/linpha2/templates/default/global.html.php	2006-08-30 21:42:46 UTC (rev 4564)
@@ -72,12 +72,12 @@
 <!-- menu -->
 <div id="menu">
 	<ul>
-		<li><a href="./"><?php echo i18n("Home"); ?></a></li>
+		<li><a href="<?php echo LINPHA_DIR; ?>/"><?php echo i18n("Home"); ?></a></li>
 	</ul>
 	<ul>
 		<li><span><?php echo i18n("Search"); ?>&nbsp;&nbsp;</span>
 			<ul>
-				<li><a href="./?cat=search"><?php echo i18n("Extended Search"); ?></a></li>
+				<li><a href="<?php echo LINPHA_DIR; ?>/?cat=search"><?php echo i18n("Extended Search"); ?></a></li>
 				<li>
 					<div>
 						<form method="GET" action="<?php echo LINPHA_DIR; ?>/?cat=search">
@@ -129,9 +129,9 @@
 		<a href="<?php echo $GLOBALS['linpha']->template->URL_full; ?>&amp;slideshow=play"><img src="<?php echo LINPHA_DIR.'/templates/'.$GLOBALS['linpha']->template->template_name.'/images/slideshow.png'; ?>" border="0" title="<?php echo i18n("Play Slideshow"); ?>" /></a>
 	</div>
 	<ul>
-		<li><a href="./?cat=settings"><?php echo i18n("My Settings"); ?></a></li>
+		<li><a href="<?php echo LINPHA_DIR; ?>/?cat=settings"><?php echo i18n("My Settings"); ?></a></li>
 	</ul>
-	<?php $GLOBALS['linpha']->template->printMenu("Admin","./admin/"); ?>
+	<?php $GLOBALS['linpha']->template->printMenu("Admin",LINPHA_DIR."/admin/"); ?>
 </div>
 <div style="clear: both;"></div>
 <!-- end menu -->


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