- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-814-g624ec9c
by Marc Delisle 19 Feb '11

19 Feb '11

The branch, master has been updated via 624ec9c5f9ddeb2394b206ba38f500a7d5181f0a (commit) from 67339bab2aa1cc20b0ba0d55d7d6b5feb538607d (commit) - Log ----------------------------------------------------------------- commit 624ec9c5f9ddeb2394b206ba38f500a7d5181f0a Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 19 10:38:58 2011 -0500 Make edit privileges panel more manageable ----------------------------------------------------------------------- Summary of changes: js/server_privileges.js | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/js/server_privileges.js b/js/server_privileges.js index a18ec9f..5fe8398 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -212,6 +212,7 @@ $(document).ready(function() { width: 800, // height is a workaround for this Chrome problem: // http://bugs.jqueryui.com/ticket/4671 + // also it's interesting to be able to scroll this window height: 600, modal: true, buttons: button_options @@ -322,6 +323,7 @@ $(document).ready(function() { .append(data) .dialog({ width: 900, + height: 600, buttons: button_options }); //dialog options end displayPasswordGenerateButton(); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-813-g67339ba
by Marc Delisle 19 Feb '11

19 Feb '11

The branch, master has been updated via 67339bab2aa1cc20b0ba0d55d7d6b5feb538607d (commit) from 60f85e193449f02cb81550be8dc3476d0b04e812 (commit) - Log ----------------------------------------------------------------- commit 67339bab2aa1cc20b0ba0d55d7d6b5feb538607d Author: Marc Delisle <marc(a)infomarc.info> Date: Sat Feb 19 07:49:49 2011 -0500 Current code has problems with Ajax, for example when creating a user. There are missing headers and this commit is an attempt to fix this situation. ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 14 +++++++++----- libraries/header.inc.php | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 95aaae6..a4c6a71 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -2935,11 +2935,15 @@ function PMA_ajaxResponse($message, $success = true, $extra_data = array()) $response = array_merge($response, $extra_data); } - // Set the Content-Type header to JSON so that jQuery parses the response correctly - if(!isset($GLOBALS['is_header_sent'])) { - header('Cache-Control: no-cache'); - header("Content-Type: application/json"); - } + // Set the Content-Type header to JSON so that jQuery parses the + // response correctly. + // + // At this point, other headers might have been sent; + // even if $GLOBALS['is_header_sent'] is true, + // we have to send these additional headers. + header('Cache-Control: no-cache'); + header("Content-Type: application/json"); + echo json_encode($response); exit; } diff --git a/libraries/header.inc.php b/libraries/header.inc.php index 1720e80..807ec0a 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -15,7 +15,7 @@ require_once './libraries/common.inc.php'; /** - * If this is an Ajax request, we do not need to generate all this output. + * This is not an Ajax request so we need to generate all this output. */ if (isset($GLOBALS['is_ajax_request']) && !$GLOBALS['is_ajax_request']) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-812-g60f85e1
by Marc Delisle 18 Feb '11

18 Feb '11

The branch, master has been updated via 60f85e193449f02cb81550be8dc3476d0b04e812 (commit) from aef93ba59230af6932cbdfea83a1f60d56676794 (commit) - Log ----------------------------------------------------------------- commit 60f85e193449f02cb81550be8dc3476d0b04e812 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 18 12:55:51 2011 -0500 Improve full mode navi display when CountTables is false ----------------------------------------------------------------------- Summary of changes: navigation.php | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/navigation.php b/navigation.php index ef191fe..381b561 100644 --- a/navigation.php +++ b/navigation.php @@ -423,18 +423,23 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { . '?' . $common_url_query; ?>', 'main'); return false;"> <?php - if ($GLOBALS['text_dir'] === 'rtl') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + // Might be unset if CountTables directive is false + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'rtl') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } echo htmlspecialchars($db['disp_name']); - if ($GLOBALS['text_dir'] === 'ltr') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'ltr') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } ?> </a> <?php } else { - // with only 1 db available we dont need to refresh left frame + // with only 1 db available we dont need to refresh navi frame // on db selection, only phpmain ?> <a href="<?php echo $GLOBALS['cfg']['DefaultTabDatabase'] @@ -442,12 +447,16 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { id="<?php echo htmlspecialchars($db['name']); ?>" title="<?php echo htmlspecialchars($db['comment']); ?>"> <?php - if ($GLOBALS['text_dir'] === 'rtl') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'rtl') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } echo htmlspecialchars($db['disp_name']); - if ($GLOBALS['text_dir'] === 'ltr') { - echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + if (isset($db['num_tables'])) { + if ($GLOBALS['text_dir'] === 'ltr') { + echo ' <bdo dir="ltr">(' . $db['num_tables'] . ')</bdo> '; + } } ?> </a> hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-811-gaef93ba
by Marc Delisle 18 Feb '11

18 Feb '11

The branch, master has been updated via aef93ba59230af6932cbdfea83a1f60d56676794 (commit) from 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 (commit) - Log ----------------------------------------------------------------- commit aef93ba59230af6932cbdfea83a1f60d56676794 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 18 12:44:33 2011 -0500 Bug #3178935 Navigation full mode: no expansion ----------------------------------------------------------------------- Summary of changes: navigation.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/navigation.php b/navigation.php index c162aa2..ef191fe 100644 --- a/navigation.php +++ b/navigation.php @@ -453,7 +453,7 @@ function PMA_displayDbList($ext_dblist, $offset, $count) { </a> <?php } - if ($db['num_tables']) { + if (($GLOBALS['cfg']['Server']['CountTables'] === false) || $db['num_tables']) { if (isset($tables_full[$db['name']])) { $tables = PMA_getTableList($db['name'], $tables_full[$db['name']]); } elseif (isset($tables_full[strtolower($db['name'])])) { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-810-g8cd7179
by Madhura Jayaratne 18 Feb '11

18 Feb '11

The branch, master has been updated via 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 (commit) via da82fe392b0ac802284abee3810aae9f2bc4b381 (commit) from e831df2a32e7aa7f420fca1c65b797891a298fca (commit) - Log ----------------------------------------------------------------- commit 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 Merge: da82fe392b0ac802284abee3810aae9f2bc4b381 e831df2a32e7aa7f420fca1c65b797891a298fca Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 18:56:20 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit da82fe392b0ac802284abee3810aae9f2bc4b381 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 18:54:36 2011 +0530 Bug #3183970 Losing SQL history ----------------------------------------------------------------------- Summary of changes: libraries/relation.lib.php | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 18504e2..9588853 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -22,7 +22,7 @@ if (! defined('PHPMYADMIN')) { */ function PMA_query_as_controluser($sql, $show_error = true, $options = 0) { - // Avoid caching of the number of rows affected; for example, this function + // Avoid caching of the number of rows affected; for example, this function // is called for tracking purposes but we want to display the correct number // of rows affected by the original query, not by the query generated for // tracking. @@ -760,10 +760,6 @@ function PMA_getHistory($username) { $cfgRelation = PMA_getRelationsParam(); - if (isset($_SESSION['sql_history'])) { - return array_reverse($_SESSION['sql_history']); - } - if (! $cfgRelation['historywork']) { return false; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-808-ge831df2
by Marc Delisle 18 Feb '11

18 Feb '11

The branch, master has been updated via e831df2a32e7aa7f420fca1c65b797891a298fca (commit) from 2410839251d72a6947d291f0174a85bcf9b53e53 (commit) - Log ----------------------------------------------------------------- commit e831df2a32e7aa7f420fca1c65b797891a298fca Author: Marc Delisle <marc(a)infomarc.info> Date: Fri Feb 18 08:23:09 2011 -0500 Bug #3185710 No window with the confirmation of this operation ----------------------------------------------------------------------- Summary of changes: js/sql.js | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/js/sql.js b/js/sql.js index 8173b5e..be6a7ab 100644 --- a/js/sql.js +++ b/js/sql.js @@ -230,10 +230,17 @@ $(document).ready(function() { $.post($(this).attr('action'), $(this).serialize() , function(data) { if(data.success == true) { - // fade out previous success message, if any + // fade out previous messages, if any $('.success').fadeOut(); + $('.sqlquery_message').fadeOut(); // show a message that stays on screen $('#sqlqueryform').before(data.message); + // and display the query + $('<div class="sqlquery_message"></div>') + .html(data.sql_query) + .insertBefore('#sqlqueryform'); + // unnecessary div that came from data.sql_query + $('.notice').remove(); $('#sqlqueryresults').show(); // this happens if a USE command was typed if (typeof data.reload != 'undefined') { hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-807-g2410839
by Madhura Jayaratne 18 Feb '11

18 Feb '11

The branch, master has been updated via 2410839251d72a6947d291f0174a85bcf9b53e53 (commit) from 2a754b25e44212a9d3cca035f29c86705ac8c2da (commit) - Log ----------------------------------------------------------------- commit 2410839251d72a6947d291f0174a85bcf9b53e53 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 11:47:42 2011 +0530 Should be NULL, not 'NULL' ----------------------------------------------------------------------- Summary of changes: js/sql.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/js/sql.js b/js/sql.js index fd38843..8173b5e 100644 --- a/js/sql.js +++ b/js/sql.js @@ -649,9 +649,10 @@ $(document).ready(function() { for (var key in params_to_submit) { value = params_to_submit[key]; if (value.length == 0) { - value = 'NULL'; + sql_query += ' ' + key + "=NULL, "; + } else { + sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; } - sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; } //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-806-g2a754b2
by Madhura Jayaratne 18 Feb '11

18 Feb '11

The branch, master has been updated via 2a754b25e44212a9d3cca035f29c86705ac8c2da (commit) from 82a1d451d1fad0164b4efde5b89a7f4f989b18ba (commit) - Log ----------------------------------------------------------------- commit 2a754b25e44212a9d3cca035f29c86705ac8c2da Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 07:35:12 2011 +0530 Bug #3184827 Inline edit fails on some tables ----------------------------------------------------------------------- Summary of changes: js/sql.js | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/js/sql.js b/js/sql.js index d286348..fd38843 100644 --- a/js/sql.js +++ b/js/sql.js @@ -643,12 +643,16 @@ $(document).ready(function() { */ var sql_query = 'UPDATE ' + window.parent.table + ' SET '; - $.each(params_to_submit, function(key, value) { - if(value.length == 0) { - value = 'NULL' - } - sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; - }) + // $.each() not used here since it cause problems when there is a column + // in the table with the name 'length'. See bug #3184827 + var value; + for (var key in params_to_submit) { + value = params_to_submit[key]; + if (value.length == 0) { + value = 'NULL'; + } + sql_query += ' ' + key + "='" + value.replace(/'/g, "''") + "' , "; + } //Remove the last ',' appended in the above loop sql_query = sql_query.replace(/,\s$/, ''); sql_query += ' WHERE ' + PMA_urldecode(where_clause); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-805-g82a1d45
by Madhura Jayaratne 17 Feb '11

17 Feb '11

The branch, master has been updated via 82a1d451d1fad0164b4efde5b89a7f4f989b18ba (commit) via bd8126735f5dce0e894f2e7e549a6322f30936ca (commit) from 66282adec9a900d98afa910f78d97352c75d300a (commit) - Log ----------------------------------------------------------------- commit 82a1d451d1fad0164b4efde5b89a7f4f989b18ba Merge: bd8126735f5dce0e894f2e7e549a6322f30936ca 66282adec9a900d98afa910f78d97352c75d300a Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 00:36:15 2011 +0530 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit bd8126735f5dce0e894f2e7e549a6322f30936ca Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Fri Feb 18 00:34:19 2011 +0530 Inline edit fails for foreign keys. ----------------------------------------------------------------------- Summary of changes: sql.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sql.php b/sql.php index 0232620..3655d87 100644 --- a/sql.php +++ b/sql.php @@ -65,9 +65,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value $foreignData = PMA_getForeignData($foreigners, $column, false, '', ''); - $dropdown = PMA_foreignDropdown($foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'], $_REQUEST['curr_value'], $cfg['ForeignKeyMaxLimit']); - - if( $dropdown == '<option value=""> </option>'."\n" ) { + if ($foreignData['disp_row'] == null) { //Handle the case when number of values is more than $cfg['ForeignKeyMaxLimit'] $_url_params = array( 'db' => $db, @@ -80,6 +78,7 @@ if (isset($_REQUEST['get_relational_values']) && $_REQUEST['get_relational_value .'>' . __('Browse foreign values') . '</a>'; } else { + $dropdown = PMA_foreignDropdown($foreignData['disp_row'], $foreignData['foreign_field'], $foreignData['foreign_display'], $_REQUEST['curr_value'], $cfg['ForeignKeyMaxLimit']); $dropdown = '<select>' . $dropdown . '</select>'; } hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-803-g66282ad
by Michal Čihař 17 Feb '11

17 Feb '11

The branch, master has been updated via 66282adec9a900d98afa910f78d97352c75d300a (commit) via e822d0802e327ddb2d393eb7416bab3096a759d9 (commit) from 054e265cdbae052c3d66956e90cd5fabf52fe0d9 (commit) - Log ----------------------------------------------------------------- commit 66282adec9a900d98afa910f78d97352c75d300a Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Feb 17 17:49:28 2011 +0100 Update ignore list commit e822d0802e327ddb2d393eb7416bab3096a759d9 Author: Michal Čihař <mcihar(a)novell.com> Date: Thu Feb 17 17:48:38 2011 +0100 Drop 5 years old spec file for Fedora. ----------------------------------------------------------------------- Summary of changes: contrib/packaging/Fedora/phpMyAdmin-http.conf | 12 -- contrib/packaging/Fedora/phpMyAdmin.spec | 162 ------------------------- themes/.gitignore | 1 + 3 files changed, 1 insertions(+), 174 deletions(-) delete mode 100644 contrib/packaging/Fedora/phpMyAdmin-http.conf delete mode 100644 contrib/packaging/Fedora/phpMyAdmin.spec diff --git a/contrib/packaging/Fedora/phpMyAdmin-http.conf b/contrib/packaging/Fedora/phpMyAdmin-http.conf deleted file mode 100644 index 4fb1041..0000000 --- a/contrib/packaging/Fedora/phpMyAdmin-http.conf +++ /dev/null @@ -1,12 +0,0 @@ -# -# MySQL server administration. -# -Alias /phpMyAdmin /var/www/myadmin - -<Directory /var/www/myadmin> - DirectoryIndex index.php - Options Indexes Includes ExecCGI - AllowOverride None - Order deny,allow - Allow from all -</Directory> diff --git a/contrib/packaging/Fedora/phpMyAdmin.spec b/contrib/packaging/Fedora/phpMyAdmin.spec deleted file mode 100644 index 5906da1..0000000 --- a/contrib/packaging/Fedora/phpMyAdmin.spec +++ /dev/null @@ -1,162 +0,0 @@ -%define _myadminpath /var/www/myadmin -%define pkgrelease rc1 -%define microrelease 1 - -Name: phpMyAdmin -Version: 2.8.0 -Release: %{pkgrelease}.%{microrelease} -License: GPL -Group: Applications/Databases/Interfaces -Source0: http://prdownloads.sourceforge.net/phpmyadmin/%{name}-%{version}-%{pkgrelea… -Source1: phpMyAdmin-http.conf -URL: http://sourceforge.net/projects/phpmyadmin/ -Requires: mysql -Requires: php-mysql -Buildarch: noarch -BuildRoot: %{_tmppath}/%{name}-root - -Summary: phpMyAdmin - web-based MySQL administration - -%description -phpMyAdmin can manage a whole MySQL-server (needs a super-user) but -also a single database. To accomplish the latter you'll need a -properly set up MySQL-user which can read/write only the desired -database. It's up to you to look up the appropiate part in the MySQL -manual. Currently phpMyAdmin can: - - create and drop databases - - create, copy, drop and alter tables - - delete, edit and add fields - - execute any SQL-statement, even batch-queries - - manage keys on fields - - load text files into tables - - create (*) and read dumps of tables - - export (*) and import data to CSV values - - administer multiple servers and single databases - - check referencial integrity - - create complex queries automatically connecting required tables - - create PDF graphics of your database layout - - communicate in more than 38 different languages - - -%prep -%setup -q -n %{name}-%{version}-%{pkgrelease} - - -%build - - -%install -[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d "${RPM_BUILD_ROOT}" ] && \ - rm -rf "${RPM_BUILD_ROOT}" - -# Create directories. - -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/{css,js,lang,libraries,themes} -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/{auth,dbg,dbi,engines} -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/{export,tcpdf,import} -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/transformations -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/libraries/tcpdf/font -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/themes/{darkblue_orange,original} -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/themes/darkblue_orange/{css,img} -install -d "${RPM_BUILD_ROOT}%{_myadminpath}"/themes/original/{css,img} - -# Install files. - -install libraries/config.default.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}"/config.inc.php -install *.{php,ico} "${RPM_BUILD_ROOT}%{_myadminpath}"/ -install ChangeLog LICENSE README "${RPM_BUILD_ROOT}%{_myadminpath}"/ -install Documentation.html docs.css "${RPM_BUILD_ROOT}%{_myadminpath}"/ -install css/* "${RPM_BUILD_ROOT}%{_myadminpath}/css"/ -install js/* "${RPM_BUILD_ROOT}%{_myadminpath}/js"/ -install lang/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/lang"/ -install libraries/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries"/ -install libraries/auth/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/auth"/ -install libraries/dbg/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/dbg"/ -install libraries/dbi/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/dbi"/ -install libraries/engines/*.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/engines"/ -install libraries/export/*.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/export"/ -install libraries/tcpdf/*.php "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/tcpdf"/ -install libraries/tcpdf/font/*.{php,z} \ - "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/tcpdf/font"/ -install libraries/import/*.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/import"/ -install libraries/transformations/*.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}/libraries/transformations"/ -install themes/darkblue_orange/*.{php,png} \ - "${RPM_BUILD_ROOT}%{_myadminpath}/themes/darkblue_orange"/ -install themes/darkblue_orange/css/*.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}/themes/darkblue_orange/css"/ -install themes/darkblue_orange/img/*.{png,ico} \ - "${RPM_BUILD_ROOT}%{_myadminpath}/themes/darkblue_orange/img"/ -install themes/original/*.{php,png} \ - "${RPM_BUILD_ROOT}%{_myadminpath}/themes/original"/ -install themes/original/css/*.php \ - "${RPM_BUILD_ROOT}%{_myadminpath}/themes/original/css"/ -install themes/original/img/*.{png,ico} \ - "${RPM_BUILD_ROOT}%{_myadminpath}/themes/original/img"/ - -# Create documentation directories. - -DOCROOT="${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}" -install -d "${DOCROOT}" -install -d "${DOCROOT}"/{lang,scripts,transformations} - -# Install documentation files. - -install RELEASE-DATE-* "${DOCROOT}"/ -install CREDITS ChangeLog INSTALL LICENSE "${DOCROOT}"/ -install README TODO "${DOCROOT}"/ -install Documentation.* docs.css "${DOCROOT}"/ -install lang/*.sh "${DOCROOT}"/lang/ -install scripts/* "${DOCROOT}"/scripts/ -install libraries/tcpdf/README "${DOCROOT}"/README.tcpdf -install libraries/import/README "${DOCROOT}"/README.import -install libraries/transformations/README "${DOCROOT}"/transformations/ -install libraries/transformations/TEMPLATE* "${DOCROOT}"/transformations/ -install libraries/transformations/*.sh "${DOCROOT}"/transformations/ - -# Install configuration file for Apache. - -install -d "${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d" -install "%{SOURCE1}" \ - "${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/phpMyAdmin.conf" - -# Generate non-configuration file list. - -(cd "${RPM_BUILD_ROOT}"; ls -d ."%{_myadminpath}"/*) | - sed -e '/\/config\.inc\.php$/d' -e 's/^.//' > files.list - - - -%clean -[ "${RPM_BUILD_ROOT}" != "/" ] && [ -d "${RPM_BUILD_ROOT}" ] && \ - rm -rf "${RPM_BUILD_ROOT}" - - -%files -f files.list -%defattr(644, root, root, 755) -%doc %{_docdir}/%{name}-%{version} -%dir %{_myadminpath} -%attr(640,root,apache) %config(noreplace) %verify(not size mtime md5) %{_myadminpath}/config.inc.php -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/conf.d/* - - -%changelog -* Thu Feb 23 2006 Patrick Monnerat <pm(a)datasphere.ch> -- Version 2.8.0-rc1.1. - -* Thu Dec 22 2005 Patrick Monnerat <patrick.monnerat(a)econophone.ch> -- Path "nullpw" to allow trying connection with null password after failure. -- Version 2.7.0-pl1.1. - -* Mon Aug 22 2005 Patrick Monnerat <patrick.monnerat(a)econophone.ch> -- Version 2.6.3-pl1. - -* Wed Jul 21 2004 Patrick Monnerat <patrick.monnerat(a)econophone.ch> -- Version 2.5.7-pl1. - -* Fri Nov 22 2002 Patrick Monnerat <patrick.monnerat(a)econophone.ch> -- Version 2.3.0-rc1. diff --git a/themes/.gitignore b/themes/.gitignore index 8b50898..7d874cb 100644 --- a/themes/.gitignore +++ b/themes/.gitignore @@ -29,3 +29,4 @@ xp_blue xp_dirty xp_green xp_silver +emphasis hooks/post-receive -- phpMyAdmin

1 0