files/crontab files/dump/db/0-schema.sql files/dump/db/1-users.sql files/dump/db/2-licenses.sql files/dump/db/3-themes.sql files/dump/db/4-main-site.sql files/dump/db/5-template-site.sql files/dump/sites/www/admin.manage.page files/dump/sites/www/admin.superuser.page files/dump/sites/www/admin.users.page files/dump/sites/www/auth.login.page files/dump/sites/www/auth.newaccount.page files/dump/sites/www/auth.newaccount2.page files/dump/sites/www/auth.newaccount3.page files/dump/sites/www/how-to-edit-pages.page files/dump/sites/www/nav.side.page files/dump/sites/www/start.page files/dump/sites/www/system.list-all-pages.page files/dump/sites/www/system.page-tags.page files/dump/sites/www/system.recent-changes.page files/dump/sites/www/what-is-a-wiki.page php/class/Wikidot/Facade/Exception/NotImplemented.php php/class/Wikidot/Facade/Exception/WrongReturnValue.php @@ -5,8 +5,9 @@ prepare_db: bin/prepare_db.php | psql db: - bin/bootstrap_db.php files/singlewiki-dump.sql + bin/bootstrap_db.php files/dump/db/*.sql bin/generate_om.php + bin/bootstrap_pages.php files/dump/sites/* config: bin/configure.php Makefile @@ -32,4 +32,4 @@ require ('../php/setup.php'); $host = GlobalProperties::$IP_HOST . ':' . GlobalProperties::$HTTP_PORT; $key = GlobalProperties::$SECRET_MANAGE_SUPERADMIN; -echo "http://$host/admin:superadmin/key/$key\n"; +echo "http://$host/admin:superuser/key/$key\n"; bin/finish_url.php @@ -46,6 +46,12 @@ abstract class Wikidot_Facade_Base { /** * + * @var bool + */ + protected $clear_parent_page = false; + + /** + * * @var string */ protected $title = null; @@ -63,13 +69,37 @@ abstract class Wikidot_Facade_Base { protected $tags = null; /** + * + * @var array + */ + protected $config = array(); + + /** + * + * @var array + */ + protected $config_keys = array('expose_file_path'); + + /** * construct Facade object * * @param $performer DB_OzoneUser + * @param $app string application + * @param $config array configuration array, keys: expose_file_path: false by default */ - public function __construct($performer = null, $app = null) { + public function __construct($performer = null, $app = null, $config = null) { $this->performer = $performer; $this->app = $app; + + if (is_array($config)) { + foreach ($this->config_keys as $key) { + if (isset($config[$key])) { + $this->config[$key] = $config[$key]; + } else { + $this->config[$key] = null; + } + } + } } /** @@ -110,13 +140,13 @@ abstract class Wikidot_Facade_Base { $this->parent_page = $value; break; case "title": - $this->title = $this->_parseString($value, "title"); + $this->title = $this->_parseString($value, "title", 128); break; case "source": - $this->source = $this->_parseString($value, "source"); + $this->source = $this->_parseString($value, "source", 200000); break; case "tags": - $this->tags = $this->_parseTags($value); + $this->tags = $this->_parseTags($value, 64, 500); break; default: throw new Wikidot_Facade_Exception_WrongArguments("Invalid argument array key: $key"); @@ -137,6 +167,10 @@ abstract class Wikidot_Facade_Base { $this->parent_page = $this->_parsePage($this->site, $this->parent_page); } + if ($this->parent_page === "") { // empty string is passed as the parent_page + $this->clear_parent_page = true; + } + foreach ($requiredArgs as $key) { if (! $this->$key) { throw new Wikidot_Facade_Exception_WrongArguments("Required argument array key not passed: $key"); @@ -178,24 +212,44 @@ abstract class Wikidot_Facade_Base { throw new Wikidot_Facade_Exception_WrongReturnValue("Invalid type of returned value"); } - protected function _parseString($value, $key = "") { + protected function _parseString($value, $key = "", $max_length = null, $trim = true) { + if (is_numeric($value)) { + $value = "$value"; + } if (is_string($value)) { + + if ($trim) { + $value= trim($value); + } + + if ($max_length && strlen8($value) > $max_length) { + throw new Wikidot_Facade_Exception_WrongArguments("Argument $key is too long (> $max_length)"); + } + return $value; } - if (is_numeric($value)) { - return "$value"; - } throw new Wikidot_Facade_Exception_WrongArguments("Argument $key must be a string"); } - protected function _parseTags($tags) { + protected function _parseTags($tags, $max_tag_length = null, $max_total_length = null) { if (is_string($tags)) { $tags = preg_split("/[ ,]+/", trim($tags)); } - if (is_array($tags)) { - return $tags; + if (! is_array($tags)) { + throw new Wikidot_Facade_Exception_WrongArguments("Invalid tags argument (it must be array or string)"); + } + $tags = array_unique($tags); + $total_length = -1; + $tags_new = array(); + foreach ($tag as $tags) { + $tag = $this->_parseString($tag, "tag", $max_tag_length); + $total_length += strlen8($tag) + 1; + $tags_new[] = strtolower($tag); } - throw new Wikidot_Facade_Exception_WrongArguments("Invalid tags argument (it must be array or string)"); + if ($total_length > $max_total_length) { + throw new Wikidot_Facade_Exception_WrongArguments("Tags are too long (> $max_total_length)"); + } + return $tags_new; } protected function _parseUser($user) { @@ -203,6 +257,13 @@ abstract class Wikidot_Facade_Base { $user = DB_OzoneUserPeer::instance()->selectByPrimaryKey($user); } + if (is_string($user)) { + $c = new Criteria(); + $unix_name = WDStringUtils::toUnixName($user); + $c->add('unix_name', $unix_name); + $user = DB_OzoneUserPeer::instance()->selectOne($c); + } + if ($user instanceof DB_OzoneUser) { return $user; } @@ -386,15 +447,18 @@ abstract class Wikidot_Facade_Base { * @return array */ protected function _reprFile($file) { - return array( + $r = array( "url" => $file->getFileURI(), "name" => $file->getFilename(), - "path" => $file->getFilePath(), "mime" => $file->getMimetype(), "description" => $file->getDescription(), "comment" => $file->getComment(), "date_added" => $this->_reprDate($file->getDateAdded()), "size" => $file->getSize(), ); + if ($this->config['expose_file_path']) { + $r['path'] = $file->getFilePath(); + } + return $r; } } php/class/Wikidot/Facade/Base.php @@ -39,72 +39,257 @@ class Wikidot_Facade_Page extends Wikidot_Facade_Base { $files = DB_FilePeer::instance()->select($c); return $this->repr($files); - } + } + + private function _getOrCreateCategory($site, $categoryName) { + $category = DB_CategoryPeer::instance()->selectByName($categoryName, $site->getSiteId(), false); + if ($category == null){ + // create the category - just clone the default category!!! + $category = DB_CategoryPeer::instance()->selectByName("_default", $site->getSiteId(), false); + $category->setCategoryId(null); + $category->setNew(true); + $category->setName($categoryName); + // fill with some important things - we assume the _default category exists!!! IT REALLY SHOULD!!! + $category->setPerPageDiscussion(null); //default value + // set default permissions theme and license + $category->setPermissionsDefault(true); + $category->setThemeDefault(true); + $category->setLicenseDefault(true); + $category->setNavDefault(true); + $category->save(); + } + return $category; + } public function save($args) { + $db = Database::connection(); + $db->begin(); + + // simple argument checking if (! isset($args['page'])) { throw new Wikidot_Facade_Exception_WrongArguments("Page argument must be passed"); } - $arg_page = $args['page']; + $pm = new WDPermissionManager(); + $now = new ODate(); + // page (existant or not) name + $arg_page = WDStringUtils::toUnixName($args['page']); + + // parse the rest (beside page name) unset($args['page']); $this->parseArgs($args, array("performer", "site")); try { + // parse page name to figure out if it points to an existant page $page = $this->_parsePage($this->site, $arg_page); - // page exists $new = false; + + // check permissions to edit the page + $pm->hasPagePermission('edit', $this->performer, $page->getCategory(), $page); + + } catch (Wikidot_Facade_Exception_WrongArguments $e) { + if ($this->source === null) { + $this->source = ""; + } + if ($this->title === null) { + $this->title = $arg_page; + } + $new = true; + + $category_name = preg_replace('/^([^:]*):.*$/', '\1', $arg_page); + if ($category_name == $arg_page) { + $category_name = '_default'; + } + $category = $this->_getOrCreateCategory($this->site, $category_name); + + $page = new DB_Page(); + $page->setSiteId($this->site->getSiteId()); + $page->setCategoryId($category->getCategoryId()); + $page->setUnixName($arg_page); + $page->setDateCreated(new ODate()); + $page->setOwnerUserId($this->performer->getUserId()); + $page->save(); + + $compiled = new DB_PageCompiled(); + $compiled->setPageId($page->getPageId()); + $compiled->save(); + } + + // get current revision and metadata + if (! $new) { + $cur_rev = $page->getCurrentRevision(); + $cur_meta = $cur_rev->getMetadata(); + } - // check permision to edit here + // construct new metadata + if ($new) { + $new_meta = new DB_PageMetadata(); + $new_meta->setUnixName($arg_page); + $new_meta->setOwnerUserId($this->performer->getUserId()); + } else { + $new_meta = clone $cur_meta; + $new_meta->setNew(true); + $new_meta->setMetadataId(null); + } + + // construct new revision + $new_rev = new DB_PageRevision(); + $new_rev->setSiteId($this->site->getSiteId()); + $new_rev->setPageId($page->getPageId()); + $new_rev->setDateLastEdited($now); + if ($new) { + $new_rev->setRevisionNumber(0); + } else { + $new_rev->setRevisionNumber($cur_rev->getRevisionNumber() + 1); + } + + $src_changed = false; + $title_changed = false; + $parent_changed = false; + $tags_changed = false; + + // handle source change + if ($new || ($this->source !== null && $page->getSource() != $this->source)) { - } catch (Wikidot_Facade_Exception_WrongArguments $e) { + $new_src = new DB_PageSource(); + $new_src->setText($this->source); + $new_src->save(); - // page does not exist - $new = true; + $new_rev->setSourceId($new_src->getSourceId()); + $new_rev->setFlagText(true); - // check permission to create here + $src_changed = true; + + } else { + + $new_rev->setSourceId($cur_rev->getSourceId()); + $new_rev->setSinceFullSource($cur_rev->getSinceFullSource()); + $new_rev->setDiffSource($cur_rev->getDiffSource()); - // create - $page = new DB_Page(); - // ... } - if ($this->title === null && ! $this->tags && ! $this->parent_page && $this->source === null) { + // handle tags change + if ($this->tags) { + + $new_tags = $this->tags; + $cur_tags = $page->getTagsAsArray(); - if ($new) { - // save a new page, but only page_name is passed + sort($cur_tags); + sort($new_tags); + + if ($cur_tags != $new_tags) { + $tags_changed = true; + $tags_deleted = array(); + $tags_added = array(); - } else { - // no changes - // maybe recompile? - // - // or just throw Wikidot_Facade_Exception_WrongArgument + foreach ($cur_tags as $tag) { + if (! in_array($tag, $new_tags)) { + + $c = new Criteria(); + $c->add('page_id', $page->getPageId()); + $c->add('tag', $tag); + + if ($t = DB_PageTagPeer::instance()->selectOne($c)) { + $t->delete(); + $tags_deleted[] = $tag; + } + } + } + foreach ($new_tags as $tag) { + if (! in_array($tag, $cur_tags)) { + $t = new DB_PageTag(); + $t->getPageId($page->getPageId()); + $t->setSiteId($this->site->getSiteId()); + $t->setTag($tag); + $t->save(); + + $tags_added[] = $tag; + } + } } - - return; } - if ($this->source !== null) { - // set source + // handle metadata: title change + if ($new || ($this->title !== null && $cur_meta->getTitle() != $this->title)) { + + $new_meta->setTitle($this->title); + $page->setTitle($this->title); + $title_changed = true; } - if ($this->title !== null) { - // set title + // handle metadata: parent page change + if ($this->parent_page) { + if (! $cur_meta->getParentPageId() || + $cur_meta->getParentPageId() != $this->parent_page->getPageId() + ) { + $new_meta->setParentPageId($this->parent_page->getPageId()); + $parent_changed = true; + } } - - if ($this->tags) { - // set tags + if ($this->clear_parent_page && $page->getParentPageId()) { + $new_meta->setParentPageId(null); + $parent_changed = true; } - if ($this->parent_page) { - // set parent_page + $meta_changed = $title_changed || $parent_changed; + + // decide whether to use previous metadata or create a new object + if ($meta_changed) { + + $new_meta->save(); + $new_rev->setMetadataId($new_meta->getMetadataId()); + + } else { + $new_rev->setMetadataId($cur_meta->getMetadataId()); } - // save new revision and stuff + if ($src_changed || $meta_changed || $tags_changed) { + + $new_rev->save(); + + $page->setSourceId($new_rev->getSourceId()); + $page->setDateLastEdited($now); + $page->setMetadataId($new_rev->getMetadataId()); + $page->setRevisionNumber($new_rev->getRevisionNumber()); + $page->setRevisionId($new_rev->getRevisionId()); + $page->save(); + + $db->commit(); + + $GLOBALS['site'] = $this->site; + $outdater = new Outdater(); + if ($src_changed) { + $outdater->pageEvent("source_changed", $page); + } + if ($title_changed) { + $outdater->pageEvent("title_changed", $page); + } + if ($parent_changed) { + $outdater->pageEvent("parent_changed", $page); + } + if ($tags_changed) { + $outdater->pageEvent("tag_changed", $page); + } + + } else { + + /* This place is reached when API client tries to set source or + * title or parent page or tags that are already set (in the DB) + * to the same value. + * + * Let's suppose doing nothing is the desired behavior in this case + * + * Other possible way to react can be raising an exception. + * But it should be different from Wikidot_Facade_Exception_WrongArguments + * because this one implies client error (and client does not need + * to know the exact database state). + */ + + } } } php/class/Wikidot/Facade/Page.php files/db_dump/0-schema.sql files/db_dump/1-users.sql files/db_dump/2-licenses.sql files/db_dump/3-themes.sql files/db_dump/4-main-site.sql files/db_dump/5-template-site.sql files/farm-dump.sql files/singlewiki-dump.sql php/class/Wikidot/Facade/Exception/ReturnValueException.php 8be37649fec381a26370cbd16f6a73f69348e6f8 Piotr Gabryjeluk piotr@wikidot.com http://github.com/gabrys/wikidot/commit/4c4cdb34e9deb21e8c04ebbaef9fd1f2c110af5b 4c4cdb34e9deb21e8c04ebbaef9fd1f2c110af5b 2009-06-19T17:02:38-07:00 2009-06-19T17:02:38-07:00 introduced new dump load system 3527fa37ac6666120b4c257464ae8f489501e822 Piotr Gabryjeluk piotr@wikidot.com